Merge "e2e-tests: Replace value of 1 with reused constant" into stable-3.0
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ApproveChange.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ApproveChange.scala
index fe46bd6..e808d0d 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ApproveChange.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ApproveChange.scala
@@ -43,6 +43,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckMasterBranchReplica1.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckMasterBranchReplica1.scala
index 0ed22c7..96269f2 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckMasterBranchReplica1.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckMasterBranchReplica1.scala
@@ -51,23 +51,23 @@
setUp(
createChange.test.inject(
nothingFor(stepWaitTime(createChange) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
approveChange.test.inject(
nothingFor(stepWaitTime(approveChange) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
submitChange.test.inject(
nothingFor(stepWaitTime(submitChange) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
getBranch.test.inject(
nothingFor(stepWaitTime(getBranch) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
test.inject(
nothingFor(stepWaitTime(this) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
).protocols(httpForReplica),
).protocols(httpProtocol)
}
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 2424209..f1966b3 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
@@ -42,6 +42,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala
index c70c393..9f01e9f 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala
@@ -39,15 +39,15 @@
setUp(
createProject.test.inject(
nothingFor(stepWaitTime(createProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
test.inject(
nothingFor(stepWaitTime(this) seconds),
- constantUsersPerSec(1) during (duration seconds)
+ constantUsersPerSec(single) during (duration seconds)
),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) + duration seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
).protocols(gitProtocol, 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 c7fb8ed..ce37777 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
@@ -50,19 +50,19 @@
setUp(
createProject.test.inject(
nothingFor(stepWaitTime(createProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
test.inject(
nothingFor(stepWaitTime(this) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
deleteChange.test.inject(
nothingFor(stepWaitTime(deleteChange) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala
index 3d5e677..d631292 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala
@@ -32,6 +32,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
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 aa6fe0d..5a06ff7 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
@@ -43,6 +43,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala
index 983ac0b..2007eba 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala
@@ -32,6 +32,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala
index 94f4ae3..3dd8493 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala
@@ -38,23 +38,23 @@
setUp(
createProject.test.inject(
nothingFor(stepWaitTime(createProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
getCacheEntriesAfterProject.test.inject(
nothingFor(stepWaitTime(getCacheEntriesAfterProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
flushCache.inject(
nothingFor(stepWaitTime(this) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
checkCacheEntriesAfterFlush.test.inject(
nothingFor(stepWaitTime(checkCacheEntriesAfterFlush) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
).protocols(httpProtocol)
}
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 5d6176d..fc68f97 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
@@ -30,6 +30,7 @@
protected val resource: String = s"$pathName.json"
protected val body: String = s"$pathName-body.json"
protected val unique: String = name + "-" + this.hashCode()
+ protected val single = 1
private val powerFactor: Double = replaceProperty("power_factor", 1.0).toDouble
protected val SecondsPerWeightUnit: Int = 2
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala
index 0060d1c..4ceba60 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetMasterBranchRevision.scala
@@ -36,6 +36,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala
index 27e3f19..e73559e 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GetProjectsCacheEntries.scala
@@ -40,6 +40,6 @@
setUp(
test.inject(
- atOnceUsers(1)
+ atOnceUsers(single)
)).protocols(httpProtocol)
}
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala
index e5b41b3..1af2dc5 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala
@@ -43,7 +43,7 @@
setUp(
createProject.test.inject(
nothingFor(stepWaitTime(createProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
test.inject(
nothingFor(stepWaitTime(this) seconds),
@@ -54,7 +54,7 @@
),
deleteProject.test.inject(
nothingFor(maxBeforeDelete seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
).protocols(gitProtocol, httpProtocol)
.maxDuration(maxExecutionTime seconds)
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala
index bfcb7c9f..48f9fa8 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala
@@ -47,23 +47,23 @@
setUp(
createProject.test.inject(
nothingFor(stepWaitTime(createProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
createChange.test.inject(
nothingFor(stepWaitTime(createChange) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
approveChange.test.inject(
nothingFor(stepWaitTime(approveChange) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
test.inject(
nothingFor(stepWaitTime(this) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) seconds),
- atOnceUsers(1)
+ atOnceUsers(single)
),
).protocols(httpProtocol)
}
