commit | 8ba6c8a68a7af248f895d80374c5ea377ca9c878 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@digital.ai> | Sat May 23 11:15:34 2020 +0900 |
committer | David Pursehouse <dpursehouse@digital.ai> | Sat May 23 11:15:34 2020 +0900 |
tree | 5c9c7908696fc219bbb50c73caac21efa23b04da | |
parent | 3cb8b13e7e966a8addb1685de51ac62567b2700e [diff] | |
parent | 887f5d09d6ebbfe12de983029c651011215d169e [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: CreateChange: Clarify the e2e test access modifier e2e-tests: Fix minor comma styling inconsistencies Set version to 2.16.19 Change-Id: I4669d10db4301e9630786371c6ac494d05c79436
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 040e5cf..2424209 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 @@ 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 a5d7358..57e6bcd 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 @@ 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 a5d3801..1b3bbc1 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 @@ setUp( test.inject( atOnceUsers(1) - ), - ).protocols(httpProtocol) + )).protocols(httpProtocol) }