| commit | 42f9c79bf285e8ce2bfed7366471af8bf467e9c8 | [log] [tgz] |
|---|---|---|
| author | Mark Bekhet <bekhet.mark@gmail.com> | Mon Mar 15 15:41:53 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Mar 15 15:41:53 2021 +0000 |
| tree | cb502aeb1a39a707f0812b08d42f6c11398691b8 | |
| parent | a261d924a8ed74d27bab2bc5e9407aa88f50d817 [diff] | |
| parent | 9b8d41ea4fe549712dcefd222befc89def5c8d20 [diff] |
Merge "CreateChangesTriggeringGc: Customize data to execute garbage collection" into stable-3.1
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 bbd1f59..c6a4534 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" private lazy val minuteMultiplier = getProperty("minute_multiplier", 1).toInt lazy val secondsToNextEvaluation: Int = 60 * minuteMultiplier @@ -51,7 +50,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