Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
CreateChangeUsingMultiGerrit: Fix 401 towards 8081
Change-Id: Ifa501813aff86a42fd025afbabdb6aeb12c17501
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
index 8fcddd4..f6e610b 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
@@ -55,7 +55,7 @@
deleteChange.test.inject(
nothingFor(stepWaitTime(deleteChange) seconds),
atOnceUsers(1)
- ),
+ ).protocols(deleteChange.httpForReplica),
deleteProject.test.inject(
nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(1)
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
index cac806a..e086efe 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
@@ -15,10 +15,12 @@
package com.googlesource.gerrit.plugins.multisite.scenarios
import com.google.gerrit.scenarios.GerritSimulation
+import com.typesafe.config.ConfigFactory
import io.gatling.core.Predef.{atOnceUsers, _}
import io.gatling.core.feeder.FeederBuilder
import io.gatling.core.structure.ScenarioBuilder
import io.gatling.http.Predef.http
+import io.gatling.http.protocol.HttpProtocolBuilder
class DeleteChangeUsingMultiGerrit1 extends GerritSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
@@ -30,6 +32,10 @@
replaceProperty("http_port1", 8081, in)
}
+ val httpForReplica: HttpProtocolBuilder = http.basicAuth(
+ conf.httpConfiguration.userName,
+ ConfigFactory.load().getString("http.password_replica"))
+
val test: ScenarioBuilder = scenario(unique)
.feed(data)
.exec(session => {
@@ -44,5 +50,5 @@
setUp(
test.inject(
atOnceUsers(1)
- )).protocols(httpProtocol)
+ )).protocols(httpForReplica)
}
