commit d11f1bc05d8e1d2239241cef63a9595f097d0b30
author Marco Miller <marco.miller@ericsson.com> Tue Sep 15 10:53:50 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Sep 15 10:53:50 2020 -0400
tree 4457368bae5064f3eee5964de7ee114373083d43
parent ea9be3a4684ad418b459765cf2ec856b87693052
parent 0f57de4e79917a85be1409bde60be68b3fd20bd9

Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ia2d6512ee38b0569138ef355e3b5b6b26e1c7b28

src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala

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 f1d2727..cc80577 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
@@ -50,10 +50,10 @@
     test.inject(
       nothingFor(stepWaitTime(this) seconds),
       atOnceUsers(single)
-    ),
+    ).protocols(gitProtocol),
     deleteProject.test.inject(
       nothingFor(createProject.maxExecutionTime + maxExecutionTime seconds),
       atOnceUsers(single)
     ),
-  ).protocols(gitProtocol, httpProtocol)
+  ).protocols(httpProtocol)
 }

src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala

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 68508c7..5270ce0 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
@@ -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)
 }