| commit | 79c51e12414f08c4a7e42893a8a200fdd7b5333c | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@digital.ai> | Sat May 23 14:43:24 2020 +0900 |
| committer | David Pursehouse <dpursehouse@digital.ai> | Sat May 23 14:43:24 2020 +0900 |
| tree | c9158a6a772e31059d39390b9368112947251cbf | |
| parent | f1a142e9869f9c3be5e0483c54ec7eb10d56b415 [diff] | |
| parent | 5d9299da268095807aee2847e6eee85c9231d673 [diff] |
Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: CreateChange: Clarify the e2e test access modifier e2e-tests: Fix minor comma styling inconsistencies Set version to 2.16.19 Change-Id: I0a6495ae80064d15de03fee923061c874eb863e7
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) }