| commit | 9e71aa4e1278b078594bb1a9a2c142a3b724c8c0 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Mon May 31 13:23:57 2021 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Mon May 31 13:23:57 2021 -0400 |
| tree | 440c7dce74b1d007795814784c085300f6ea6610 | |
| parent | e18db34a616a8ed7716f15c58005cdc42a0ad107 [diff] | |
| parent | 438293f5ff8bb37f218eda3697dd7b8b54918624 [diff] |
Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: e2e-tests: Fix regex to adapt to JSON_COMPACT Use Gerrit 3.1.15 in Dockerfile Change-Id: I041678abf09cac33e08f81c7b2fc6e79f4364bed
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala index 6a0d07f..7e63134 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
@@ -42,7 +42,7 @@ } }) .exec(http(uniqueName).get("${url}") - .check(regex("\"" + memKey + "\": (\\d+)") + .check(regex("\"" + memKey + "\":(\\d+)") .is(session => session(entriesKey).as[String]))) setUp(
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala index ed19c0b..8a04245 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala
@@ -31,7 +31,7 @@ val test: ScenarioBuilder = scenario(uniqueName) .feed(data) .exec(http(uniqueName).get("${url}") - .check(regex("\"" + memKey + "\": (\\d+)").saveAs(entriesKey))) + .check(regex("\"" + memKey + "\":(\\d+)").saveAs(entriesKey))) .exec(session => { if (consumer.nonEmpty) { consumer.get.entriesBeforeFlush(session(entriesKey).as[Int])