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

Integrate schoir for distributed testing.

Browse source
This commit is contained in:
Eugene Vigdorchik 2012-01-12 12:47:11 +04:00
parent 86265b2118
commit edc1d8046f
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -61,3 +61,5 @@ akka.sublime-workspace
.target .target
.multi-jvm .multi-jvm
_mb _mb
schoir.props
worker*.log

3
akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
View file

@ -28,7 +28,6 @@ object ZkClient extends Watcher {
zk.exists("/", false); true zk.exists("/", false); true
} catch { } catch {
case _: KeeperException.ConnectionLossException => case _: KeeperException.ConnectionLossException =>
println("Server is not ready, sleeping...")
Thread.sleep(10000) Thread.sleep(10000)
false false
} }
@ -61,7 +60,6 @@ object ZkClient extends Watcher {
} }
def enter() { def enter() {
println("ZK creating " + root + "/" + name)
zk.create(root + "/" + name, Array[Byte](), Ids.OPEN_ACL_UNSAFE, zk.create(root + "/" + name, Array[Byte](), Ids.OPEN_ACL_UNSAFE,
CreateMode.EPHEMERAL) CreateMode.EPHEMERAL)
@ -69,7 +67,6 @@ object ZkClient extends Watcher {
} }
final def leave() { final def leave() {
println("ZK leaving " + root + "/" + name)
zk.create(root + "/" + name + ".leave", Array[Byte](), Ids.OPEN_ACL_UNSAFE, zk.create(root + "/" + name + ".leave", Array[Byte](), Ids.OPEN_ACL_UNSAFE,
CreateMode.EPHEMERAL) CreateMode.EPHEMERAL)

3
project/AkkaBuild.scala
View file

@ -8,6 +8,7 @@ import sbt._
import sbt.Keys._ import sbt.Keys._
import com.typesafe.sbtmultijvm.MultiJvmPlugin import com.typesafe.sbtmultijvm.MultiJvmPlugin
import com.typesafe.sbtmultijvm.MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions } import com.typesafe.sbtmultijvm.MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
import com.typesafe.schoir.SchoirPlugin.schoirSettings
import com.typesafe.sbtscalariform.ScalariformPlugin import com.typesafe.sbtscalariform.ScalariformPlugin
import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys
import java.lang.Boolean.getBoolean import java.lang.Boolean.getBoolean
@ -70,7 +71,7 @@ object AkkaBuild extends Build {
id = "akka-remote", id = "akka-remote",
base = file("akka-remote"), base = file("akka-remote"),
dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"), dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"),
settings = defaultSettings ++ multiJvmSettings ++ Seq( settings = defaultSettings ++ multiJvmSettings ++ schoirSettings ++ Seq(
libraryDependencies ++= Dependencies.cluster, libraryDependencies ++= Dependencies.cluster,
// disable parallel tests // disable parallel tests
parallelExecution in Test := false, parallelExecution in Test := false,

5
project/plugins.sbt
View file

@ -1,7 +1,9 @@
resolvers += Classpaths.typesafeResolver resolvers += Classpaths.typesafeResolver
addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.7") addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.9")
addSbtPlugin("com.typesafe.schoir" % "schoir" % "0.1.1")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.5.0") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.5.0")
@ -12,4 +14,3 @@ resolvers ++= Seq(
"coda" at "http://repo.codahale.com") "coda" at "http://repo.codahale.com")
addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1") addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")