commit 21e3e4ac23ca81534b6dfcd6e3e49967b55fa087
author Marco Miller <marco.miller@ericsson.com> Tue Sep 15 11:08:53 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Sep 15 11:08:53 2020 -0400
tree 79ada4430673b0550ef53f366ff506d364b78142
parent d2aafa5ea6ab7f7c0c2eaad8ee4c7c788ec3ebf8
parent dfeee1fbb43dd2d2f3df10837b5be6962472b99b

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Refine protocol assignment in scenarios using multiple protocols

Change-Id: I824c7d4d298a6328756efe462f5b5b43cffe65ca

src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala

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)
 }

src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala

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)
 }