| commit | a261d924a8ed74d27bab2bc5e9407aa88f50d817 | [log] [tgz] |
|---|---|---|
| author | Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> | Tue Mar 02 10:26:07 2021 -0500 |
| committer | Nguyen Tuan Khang Phan <phan.khang5@gmail.com> | Thu Mar 11 19:09:43 2021 +0000 |
| tree | d4612558df5db473bb0f20ca72bc2db5d75cb6df | |
| parent | 29fc5737d3dff5c551a8f1d92227f8bff1258e79 [diff] |
e2e-tests: Reuse the now available numberKey from GerritSimulation Change-Id: Ie062ffa5fdb1d03ade482aa198b388466acfad50
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.scala b/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.scala index bc74935..469677a 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.scala
@@ -24,7 +24,6 @@ class CreateChangesTriggeringGc extends ProjectSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).circular - private val numberKey = "_number" lazy val DefaultSecondsToNextEvaluation = 60 private lazy val DefaultLooseObjectsToEnqueueGc = 400 @@ -50,7 +49,7 @@ .feed(data) .exec(httpRequest .body(ElFileBody(body)).asJson - .check(regex("\"" + numberKey + "\":(\\d+),").saveAs(numberKey))) + .check(regex("\"_" + numberKey + "\":(\\d+),").saveAs(numberKey))) .exec(session => { deleteChanges.upToNumber = session(numberKey).as[Int] session
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.scala b/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.scala index 4775551..3019aed 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.scala
@@ -22,7 +22,6 @@ class DeleteChangesAfterGc extends GerritSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).circular - private val numberKey = "number" var upToNumber = 1 private lazy val OrderOfChangesToDelete = 200