| commit | cda42da487dd97c017e30053e9a8b4b4168b90d6 | [log] [tgz] |
|---|---|---|
| author | Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> | Thu Feb 18 10:26:19 2021 -0500 |
| committer | Nguyen Tuan Khang Phan <phan.khang5@gmail.com> | Mon Feb 22 17:53:31 2021 +0000 |
| tree | c44f32ff96de87809a543d80a5dd2f2f945cdd81 | |
| parent | 361aecc49675b27c676f45d3f2cd1283ad0911db [diff] |
e2e-tests: Fix regex to adapt to JSON_COMPACT Since stable-3.1 commit [1] JSON responses output COMPACT_JSON unconditionally. [1] commit 8ae8584c30dd2a0be4d01e0c741afc32f443f62b Change-Id: Ia03546512d5bfe39684ac893e19cfa161a090a78
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala index 96943ce..900702a 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala
@@ -37,7 +37,7 @@ } }) .exec(http(uniqueName).get("${url}") - .check(regex("\"" + memKey + "\": (\\d+)") + .check(regex("\"" + memKey + "\":(\\d+)") .is(session => session(entriesKey).as[String]))) setUp(
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala index 1137ad5..f2236d1 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala
@@ -23,7 +23,7 @@ private val data: FeederBuilder = jsonFile(resource).convert(keys).queue var revision: Option[String] = None val revisionKey = "revision" - val revisionPattern: String = "\"" + revisionKey + "\": \"(.+)\"" + val revisionPattern: String = "\"" + revisionKey + "\":\"(.+)\"" val test: ScenarioBuilder = scenario(uniqueName) .feed(data)
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala index 266c0b9..0bb3afb 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala
@@ -30,7 +30,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])