Unhardcode wait times in every e2e scenario step
Do so by reusing core framework support for scenario weights. Override
core's default relative weight for scenarios heavier on the runtime.
Change-Id: I95aa1bd3a7f3f25950f1e8e8aaaa786acacb2190
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
index e55ff2f..0a88b91 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
@@ -44,14 +44,15 @@
setUp(
createProject.test.inject(
+ nothingFor(stepWaitTime(createProject) seconds),
atOnceUsers(1)
),
test.inject(
- nothingFor(21 seconds),
+ nothingFor(stepWaitTime(this) seconds),
atOnceUsers(1)
),
deleteProject.test.inject(
- nothingFor(23 seconds),
+ nothingFor(createProject.maxExecutionTime + maxExecutionTime seconds),
atOnceUsers(1)
),
).protocols(gitProtocol, httpProtocol)
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
index d2b6c4c..c99e270 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
@@ -27,6 +27,8 @@
private val default: String = name
private val numberKey = "_number"
+ override def relativeRuntimeWeight = 10
+
val test: ScenarioBuilder = scenario(unique)
.feed(data)
.exec(httpRequest
@@ -43,18 +45,19 @@
setUp(
createProject.test.inject(
+ nothingFor(stepWaitTime(createProject) seconds),
atOnceUsers(1)
),
test.inject(
- nothingFor(21 seconds),
+ nothingFor(stepWaitTime(this) seconds),
atOnceUsers(1)
),
deleteChange.test.inject(
- nothingFor(40 seconds),
+ nothingFor(stepWaitTime(deleteChange) seconds),
atOnceUsers(1)
),
deleteProject.test.inject(
- nothingFor(60 seconds),
+ nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(1)
),
).protocols(httpProtocol)
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
index 857b031..6f1c586 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
@@ -22,6 +22,8 @@
class CreateProjectUsingMultiGerrit extends ProjectSimulation {
private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue
+ override def relativeRuntimeWeight = 15
+
def this(default: String) {
this()
this.default = default
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
index 81e7578..83f0f79 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
@@ -30,22 +30,23 @@
setUp(
createProject.test.inject(
+ nothingFor(stepWaitTime(createProject) seconds),
atOnceUsers(1)
),
deleteProject.test.inject(
- nothingFor(21 seconds),
+ nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(1)
),
createItAgain.test.inject(
- nothingFor(43 seconds),
+ nothingFor(stepWaitTime(createItAgain) seconds),
atOnceUsers(1)
),
verifyProject.test.inject(
- nothingFor(70 seconds),
+ nothingFor(stepWaitTime(verifyProject) seconds),
atOnceUsers(1)
),
deleteItAfter.test.inject(
- nothingFor(72 seconds),
+ nothingFor(stepWaitTime(deleteItAfter) seconds),
atOnceUsers(1)
),
).protocols(gitProtocol, httpProtocol)
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
index 9a139f6..9cfebb2 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
@@ -24,6 +24,8 @@
private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue
var number: Option[Int] = None
+ override def relativeRuntimeWeight = 10
+
override def replaceOverride(in: String): String = {
replaceProperty("http_port1", 8082, in)
}
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
index 71c21bb..8af08c8 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
@@ -22,6 +22,8 @@
class DeleteProjectUsingMultiGerrit extends ProjectSimulation {
private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue
+ override def relativeRuntimeWeight = 10
+
def this(default: String) {
this()
this.default = default
