Speedup pull request validation
* speedup ActorCreationPerfSpec * reduce iterations in ConsistencySpec * tag SupervisorHierarchySpec as LongRunningTest * various small speedups and tagging in actor-tests * speedup expectNoMsg in stream-tests * tag FramingSpec, and reduce iterations * speedup QueueSourceSpec * tag some stream-tests * reduce iterations in persistence.PerformanceSpec * reduce iterations in some cluster perf tests * tag RemoteWatcherSpec * tag InterpreterStressSpec * remove LongRunning from ClusterConsistentHashingRouterSpec * sys property to disable multi-jvm tests in test * actually disable multi-node tests in validatePullRequest * doc sbt flags in CONTRIBUTING
This commit is contained in:
parent
267f31149c
commit
e04444567f
36 changed files with 168 additions and 114 deletions
|
|
@ -12,6 +12,11 @@ import sbt._
|
|||
import sbt.Keys._
|
||||
|
||||
object MultiNode extends AutoPlugin {
|
||||
|
||||
// MultiJvm tests can be excluded from normal test target an validatePullRequest
|
||||
// with -Dakka.test.multi-in-test=false
|
||||
val multiNodeTestInTest: Boolean =
|
||||
System.getProperty("akka.test.multi-in-test", "true") == "true"
|
||||
|
||||
object CliOptions {
|
||||
val multiNode = CliOption("akka.test.multi-node", false)
|
||||
|
|
@ -60,19 +65,21 @@ object MultiNode extends AutoPlugin {
|
|||
CliOptions.hostsFileName.map(multiNodeHostsFileName in MultiJvm := _) ++
|
||||
CliOptions.javaName.map(multiNodeJavaName in MultiJvm := _) ++
|
||||
CliOptions.targetDirName.map(multiNodeTargetDirName in MultiJvm := _) ++
|
||||
// make sure that MultiJvm tests are executed by the default test target,
|
||||
// and combine the results from ordinary test and multi-jvm tests
|
||||
(executeTests in Test <<= (executeTests in Test, multiExecuteTests) map {
|
||||
case (testResults, multiNodeResults) =>
|
||||
val overall =
|
||||
if (testResults.overall.id < multiNodeResults.overall.id)
|
||||
multiNodeResults.overall
|
||||
else
|
||||
testResults.overall
|
||||
Tests.Output(overall,
|
||||
testResults.events ++ multiNodeResults.events,
|
||||
testResults.summaries ++ multiNodeResults.summaries)
|
||||
})
|
||||
(if (multiNodeTestInTest) {
|
||||
// make sure that MultiJvm tests are executed by the default test target,
|
||||
// and combine the results from ordinary test and multi-jvm tests
|
||||
(executeTests in Test <<= (executeTests in Test, multiExecuteTests) map {
|
||||
case (testResults, multiNodeResults) =>
|
||||
val overall =
|
||||
if (testResults.overall.id < multiNodeResults.overall.id)
|
||||
multiNodeResults.overall
|
||||
else
|
||||
testResults.overall
|
||||
Tests.Output(overall,
|
||||
testResults.events ++ multiNodeResults.events,
|
||||
testResults.summaries ++ multiNodeResults.summaries)
|
||||
})
|
||||
} else Nil)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue