summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@digital.ai>2020-05-23 02:05:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-05-23 02:05:58 +0000
commit887f5d09d6ebbfe12de983029c651011215d169e (patch)
tree01caa4bbd8965f0dd926f443e6e2db5265e451f6
parentab1d01694929420277154012343deafc55d52768 (diff)
parent652932208db2558d0ad679024c3edae8b2c8989e (diff)
Merge changes Ic1fbfaa0,Id6447be5 into stable-2.16
* changes: CreateChange: Clarify the e2e test access modifier e2e-tests: Fix minor comma styling inconsistencies
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala3
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala2
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteChange.scala3
3 files changed, 3 insertions, 5 deletions
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala
index 040e5cfd1c..2424209e2d 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckProjectsCacheFlushEntries.scala
@@ -43,6 +43,5 @@ class CheckProjectsCacheFlushEntries extends CacheFlushSimulation {
setUp(
test.inject(
atOnceUsers(1)
- ),
- ).protocols(httpProtocol)
+ )).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala
index a5d7358fd4..57e6bcddc6 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala
@@ -28,7 +28,7 @@ class CreateChange extends GerritSimulation {
override def relativeRuntimeWeight = 2
- val test: ScenarioBuilder = scenario(unique)
+ private val test: ScenarioBuilder = scenario(unique)
.feed(data)
.exec(httpRequest
.body(ElFileBody(body)).asJson
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteChange.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteChange.scala
index a5d3801a83..1b3bbc1e98 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteChange.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteChange.scala
@@ -39,6 +39,5 @@ class DeleteChange extends GerritSimulation {
setUp(
test.inject(
atOnceUsers(1)
- ),
- ).protocols(httpProtocol)
+ )).protocols(httpProtocol)
}