commit 039f6be0db1e0d04fdf50c0180b88dbbef27d093
author Marco Miller <marco.miller@ericsson.com> Sat May 23 17:32:37 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Sat May 23 17:32:37 2020 -0400
tree b59c7615364fa8f34dcb7c900fda0567a9357fac
parent 5673c049943ceaf180dc2c34019220a9458fafaf
parent 2d4d5170c4b71dc572927dcef819d22b86114369

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  CreateChangeUsingHAGerrit1: Set test access modifier
  e2e-tests: Fix minor comma styling inconsistencies

Change-Id: I0826dc261eab3d06d57103d7c1f54ed3f1b51948

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

diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
index 9a9f333..10374f8 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
@@ -48,6 +48,5 @@
   setUp(
     test.inject(
       atOnceUsers(1)
-    ),
-  ).protocols(httpProtocol)
+    )).protocols(httpProtocol)
 }

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

diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
index d43c81a..f07aabd 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
@@ -33,7 +33,7 @@
     replaceProperty("http_port1", 8081, in)
   }
 
-  val test: ScenarioBuilder = scenario(unique)
+  private val test: ScenarioBuilder = scenario(unique)
     .feed(data)
     .exec(httpRequest
       .body(ElFileBody(body)).asJson

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

diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
index 28511c7..5b0f461 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
@@ -44,6 +44,5 @@
   setUp(
     test.inject(
       atOnceUsers(1)
-    ),
-  ).protocols(httpProtocol)
+    )).protocols(httpProtocol)
 }