Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Refine protocol assignment in scenarios using multiple protocols
Change-Id: I8bfca55d15def7f10098ce978e5684bc446eb8bf
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
index cfaf29f..3f066be 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
@@ -50,10 +50,10 @@
test.inject(
nothingFor(stepWaitTime(this) seconds),
atOnceUsers(single)
- ),
+ ).protocols(gitProtocol),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(single)
),
- ).protocols(gitProtocol, httpProtocol)
+ ).protocols(httpProtocol)
}
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
index dab4a04..a5904c5 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
@@ -44,10 +44,10 @@
verifyProject.test.inject(
nothingFor(stepWaitTime(verifyProject) seconds),
atOnceUsers(single)
- ),
+ ).protocols(gitProtocol),
deleteItAfter.test.inject(
nothingFor(stepWaitTime(deleteItAfter) seconds),
atOnceUsers(single)
),
- ).protocols(gitProtocol, httpProtocol)
+ ).protocols(httpProtocol)
}