commit | a480c62289f27920c98247a380f9061c02744e99 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Fri May 22 14:26:09 2020 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Fri May 22 14:26:09 2020 -0400 |
tree | ae99cbce164ac20ecf257335b2ba196b90a47f2e | |
parent | a4bc8c5375622884822393a7e63883fc1a1dd4ba [diff] | |
parent | 52aa50ae1657ced4773b2ad6ed188dcc0ca37dd9 [diff] |
Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Update git submodules GerritSimulation: Allow scenarios to further customize waits Change-Id: I92e78c68f3f36d3e75a916c9a5897767502b4542
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala index fb79f80..b427c0d 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
@@ -32,7 +32,7 @@ protected val unique: String = name + "-" + this.hashCode() private val powerFactor: Double = replaceProperty("power_factor", 1.0).toDouble - private val SecondsPerWeightUnit: Int = 2 + protected val SecondsPerWeightUnit: Int = 2 val maxExecutionTime: Int = (SecondsPerWeightUnit * relativeRuntimeWeight * powerFactor).toInt private var cumulativeWaitTime: Int = 0