diff options
| author | David Pursehouse <dpursehouse@digital.ai> | 2020-05-23 11:15:34 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@digital.ai> | 2020-05-23 11:15:34 +0900 |
| commit | 8ba6c8a68a7af248f895d80374c5ea377ca9c878 (patch) | |
| 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
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) } |