raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

+pro Update ScalaTest in order to use tag ignoring in sbt

Browse source
This commit is contained in:
Konrad Malawski 2015-05-08 15:40:34 +02:00
parent 8b045173ad
commit bebdb870b6
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
View file

@ -3,6 +3,8 @@
*/
package akka.testkit
import org.scalactic.Constraint
import language.{ postfixOps, reflectiveCalls }
import org.scalatest.{ WordSpecLike, BeforeAndAfterAll }
import org.scalatest.Matchers
@ -14,7 +16,6 @@ import com.typesafe.config.{ Config, ConfigFactory }
import akka.dispatch.Dispatchers
import akka.testkit.TestEvent._
import org.scalautils.ConversionCheckedTripleEquals
import org.scalautils.Constraint
object AkkaSpec {
val testConf: Config = ConfigFactory.parseString("""

2
project/Dependencies.scala
View file

@ -11,7 +11,7 @@ object Dependencies {
val crossScala = Seq("2.11.5", "2.10.4")
val scalaVersion = crossScala.head
val scalaStmVersion = sys.props.get("akka.build.scalaStmVersion").getOrElse("0.7")
val scalaTestVersion = sys.props.get("akka.build.scalaTestVersion").getOrElse("2.1.3")
val scalaTestVersion = sys.props.get("akka.build.scalaTestVersion").getOrElse("2.2.4")
val scalaCheckVersion = sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.11.3")
}

8
project/ValidatePullRequest.scala
View file

@ -50,9 +50,9 @@ object ValidatePullRequest extends AutoPlugin {
override def trigger = allRequirements
override lazy val projectSettings = inConfig(ValidatePR)(Defaults.testTasks) ++ Seq(
testOptions in ValidatePR += Tests.Argument("-l akka.testkit.PerformanceTest"),
testOptions in ValidatePR += Tests.Argument("-l akka.testkit.LongRunningTest"),
testOptions in ValidatePR += Tests.Argument("-l akka.testkit.TimingTest"),
testOptions in ValidatePR += Tests.Argument(TestFrameworks.ScalaTest, "-l", "performance"),
testOptions in ValidatePR += Tests.Argument(TestFrameworks.ScalaTest, "-l", "long-running"),
testOptions in ValidatePR += Tests.Argument(TestFrameworks.ScalaTest, "-l", "timing"),
targetBranch in ValidatePR := {
sys.env.get(TargetBranchEnvVarName) orElse
@ -161,7 +161,7 @@ object ValidatePullRequest extends AutoPlugin {
val theVoid = Def.task { () } // when you stare into the void, the void stares back at you
if ((projectIsAffectedByChanges in ValidatePR).value) {
log.info(s"Changes in PR are affecting project [${name.value}] - proceeding with test:test")
log.info(s"Changes in PR are affecting project [${name.value}] - proceeding with pr-validation:test")
theVoid.dependsOn(test in ValidatePR)
} else {
log.info(s"Skipping validation of [${name.value}], as PR does NOT affect this project...")