opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  e2e-tests: Make scenarios extend new GitSimulation
  Expand special search pattern on change id to 7-40

Change-Id: Ibb18d5017637ddec1aea04b86b8e7fe16dbfbffc
This commit is contained in:
Marco Miller 2020-02-05 19:23:24 -05:00
commit 6b8886a91b
3 changed files with 50 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala
View File

@ -14,29 +14,12 @@
package com.google.gerrit.scenarios package com.google.gerrit.scenarios
import java.io._
import com.github.barbasa.gatling.git.protocol.GitProtocol
import com.github.barbasa.gatling.git.request.builder.GitRequestBuilder
import com.github.barbasa.gatling.git.{GatlingGitConfiguration, GitRequestSession}
import io.gatling.core.Predef._ import io.gatling.core.Predef._
import io.gatling.core.feeder.FileBasedFeederBuilder
import io.gatling.core.structure.ScenarioBuilder import io.gatling.core.structure.ScenarioBuilder
import org.apache.commons.io.FileUtils
import org.eclipse.jgit.hooks._
import scala.concurrent.duration._ import scala.concurrent.duration._
class CloneUsingBothProtocols extends Simulation { class CloneUsingBothProtocols extends GitSimulation {
implicit val conf: GatlingGitConfiguration = GatlingGitConfiguration()
implicit val postMessageHook: Option[String] = Some(s"hooks/${CommitMsgHook.NAME}")
private val name: String = this.getClass.getSimpleName
private val file = s"data/$name.json"
private val data: FileBasedFeederBuilder[Any]#F = jsonFile(file).circular
private val request = new GitRequestBuilder(GitRequestSession("${cmd}", "${url}"))
private val protocol: GitProtocol = GitProtocol()
private val test: ScenarioBuilder = scenario(name) private val test: ScenarioBuilder = scenario(name)
.feed(data) .feed(data)
@ -46,16 +29,4 @@ class CloneUsingBothProtocols extends Simulation {
test.inject( test.inject(
constantUsersPerSec(1) during (2 seconds) constantUsersPerSec(1) during (2 seconds)
)).protocols(protocol) )).protocols(protocol)
after {
Thread.sleep(5000)
val path = conf.tmpBasePath
try {
FileUtils.deleteDirectory(new File(path))
} catch {
case e: IOException =>
System.err.println("Unable to delete temporary directory " + path)
e.printStackTrace()
}
}
} }

48
e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala Normal file
View File

@ -0,0 +1,48 @@
// Copyright (C) 2020 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.scenarios
import java.io.{File, IOException}
import com.github.barbasa.gatling.git.protocol.GitProtocol
import com.github.barbasa.gatling.git.request.builder.GitRequestBuilder
import com.github.barbasa.gatling.git.{GatlingGitConfiguration, GitRequestSession}
import io.gatling.core.Predef._
import io.gatling.core.feeder.FileBasedFeederBuilder
import org.apache.commons.io.FileUtils
import org.eclipse.jgit.hooks.CommitMsgHook
class GitSimulation extends Simulation {
implicit val conf: GatlingGitConfiguration = GatlingGitConfiguration()
implicit val postMessageHook: Option[String] = Some(s"hooks/${CommitMsgHook.NAME}")
protected val name: String = this.getClass.getSimpleName
protected val data: FileBasedFeederBuilder[Any]#F = jsonFile(s"data/$name.json").circular
protected val request = new GitRequestBuilder(GitRequestSession("${cmd}", "${url}"))
protected val protocol: GitProtocol = GitProtocol()
after {
Thread.sleep(5000)
val path = conf.tmpBasePath
try {
FileUtils.deleteDirectory(new File(path))
} catch {
case e: IOException =>
System.err.println("Unable to delete temporary directory " + path)
e.printStackTrace()
}
}
}

31
e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala
View File

@ -14,29 +14,12 @@
package com.google.gerrit.scenarios package com.google.gerrit.scenarios
import java.io._
import com.github.barbasa.gatling.git.protocol.GitProtocol
import com.github.barbasa.gatling.git.request.builder.GitRequestBuilder
import com.github.barbasa.gatling.git.{GatlingGitConfiguration, GitRequestSession}
import io.gatling.core.Predef._ import io.gatling.core.Predef._
import io.gatling.core.feeder.FileBasedFeederBuilder
import io.gatling.core.structure.ScenarioBuilder import io.gatling.core.structure.ScenarioBuilder
import org.apache.commons.io.FileUtils
import org.eclipse.jgit.hooks._
import scala.concurrent.duration._ import scala.concurrent.duration._
class ReplayRecordsFromFeeder extends Simulation { class ReplayRecordsFromFeeder extends GitSimulation {
implicit val conf: GatlingGitConfiguration = GatlingGitConfiguration()
implicit val postMessageHook: Option[String] = Some(s"hooks/${CommitMsgHook.NAME}")
private val name: String = this.getClass.getSimpleName
private val file = s"data/$name.json"
private val data: FileBasedFeederBuilder[Any]#F = jsonFile(file).circular
private val request = new GitRequestBuilder(GitRequestSession("${cmd}", "${url}"))
private val protocol: GitProtocol = GitProtocol()
private val test: ScenarioBuilder = scenario(name) private val test: ScenarioBuilder = scenario(name)
.repeat(10000) { .repeat(10000) {
@ -53,16 +36,4 @@ class ReplayRecordsFromFeeder extends Simulation {
constantUsersPerSec(20) during (15 seconds) randomized constantUsersPerSec(20) during (15 seconds) randomized
)).protocols(protocol) )).protocols(protocol)
.maxDuration(60 seconds) .maxDuration(60 seconds)
after {
Thread.sleep(5000)
val path = conf.tmpBasePath
try {
FileUtils.deleteDirectory(new File(path))
} catch {
case e: IOException =>
System.err.println("Unable to delete temporary directory " + path)
e.printStackTrace()
}
}
} }