commit | 52aa50ae1657ced4773b2ad6ed188dcc0ca37dd9 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Fri May 22 14:25:12 2020 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Fri May 22 14:25:12 2020 -0400 |
tree | d75c9044b724d8a22ea7d908caaf3842a0d393ce | |
parent | d73451aa8b9ae0fcce389462a8242f1c2c6db59f [diff] | |
parent | 3cb8b13e7e966a8addb1685de51ac62567b2700e [diff] |
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: GerritSimulation: Allow scenarios to further customize waits Change-Id: Icb8fe61adaa33625b70bd3b5b3ac4de668ffab5d
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