commit 06018d73eb9a81b41d9ff7c635039eaf5eecde01
author Marco Miller <marco.miller@ericsson.com> Thu Aug 27 15:49:09 2020 -0400
committer Marco Miller <marco.mmiller@gmail.com> Tue Sep 01 22:04:40 2020 +0000
tree 5e79b8820edd43bc5bcc6e07ddaff0e74a501562
parent 8853dfd05a2bbe7a94d5a20ba704739a94509620

Refine protocol assignment in scenarios using multiple protocols

Align the CloneUsingHAGerrit2 and CreateProjectUsingHAGerritTwice
scenarios in terms of how they assign protocols to specific tests steps.
Use the git protocol only for the step that requires it. Use the http
protocol for every other (non-git) step.

Change-Id: I6c6166efdb4fe69229cb11f223377bf142dc80a9

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