opendev/gerrit
Code Issues Proposed changes

e2e-tests: Fix regex to adapt to JSON_COMPACT

Browse Source 
Since stable-3.1 commit [1] JSON responses output COMPACT_JSON
unconditionally.

[1] commit 8ae8584c30

Change-Id: Ia03546512d5bfe39684ac893e19cfa161a090a78
This commit is contained in:
Nguyen Tuan Khang Phan
2021-02-18 10:26:19 -05:00
committed by Nguyen Tuan Khang Phan
parent 361aecc496
commit cda42da487
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala
View File

@@ -37,7 +37,7 @@ class CheckProjectsCacheFlushEntries extends CacheFlushSimulation {
}
})
.exec(http(uniqueName).get("${url}")
.check(regex("\"" + memKey + "\": (\\d+)")
.check(regex("\"" + memKey + "\":(\\d+)")
.is(session => session(entriesKey).as[String])))
setUp(

2
e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala
View File

@@ -23,7 +23,7 @@ class GetMasterBranchRevision extends ProjectSimulation {
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)

2
e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala
View File

@@ -30,7 +30,7 @@ class GetProjectsCacheEntries extends CacheFlushSimulation {
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])