Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
e2e-tests: Replace value of 1 with reused constant
Upgrade bazlets to latest stable-2.16
Change-Id: I330547e193da696bb4752cc273c0a1509526b1fe
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 404df73..014e17f 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
@@ -31,7 +31,7 @@
private lazy val LooseObjectsPerChange = 2
private lazy val ChangesMultiplier = 8
lazy val changesPerSecond: Int = 4 * ChangesMultiplier
- val ChangesForLastEvaluation = 1
+ val ChangesForLastEvaluation: Int = single
lazy val secondsForLastEvaluation: Int = SecondsPerWeightUnit
private lazy val changesToEnqueueGc = DefaultLooseObjectsToEnqueueGc * ChangesMultiplier / LooseObjectsPerChange
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGcWithProject.scala b/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGcWithProject.scala
index a6d5f63..d248703 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGcWithProject.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGcWithProject.scala
@@ -31,7 +31,7 @@
setUp(
createProject.test.inject(
nothingFor(stepWaitTime(createProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
createChanges.test.inject(
nothingFor(stepWaitTime(createChanges) seconds),
@@ -51,7 +51,7 @@
),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
).protocols(httpProtocol)
}
