diff options
author | Philipp Haller <hallerp@gmail.com> | 2010-03-25 08:52:08 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2010-03-25 08:52:08 +0000 |
commit | ab492f44e0b6aee7873639bc15939b5d9eb574e8 (patch) | |
tree | 22568fc5bcf73369eebc0a18b6f2d9c78b1776d9 | |
parent | 36ca453919ab3303d1e344aec2cb3f82c441af26 (diff) | |
download | scala-ab492f44e0b6aee7873639bc15939b5d9eb574e8.tar.gz scala-ab492f44e0b6aee7873639bc15939b5d9eb574e8.tar.bz2 scala-ab492f44e0b6aee7873639bc15939b5d9eb574e8.zip |
Makes two actor tests deterministic. No review.
-rw-r--r-- | test/files/jvm/actor-link-getstate.scala | 4 | ||||
-rw-r--r-- | test/files/jvm/actor-uncaught-exception.check | 2 | ||||
-rw-r--r-- | test/files/jvm/actor-uncaught-exception.scala | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/test/files/jvm/actor-link-getstate.scala b/test/files/jvm/actor-link-getstate.scala index cdfc8d6310..ec01757883 100644 --- a/test/files/jvm/actor-link-getstate.scala +++ b/test/files/jvm/actor-link-getstate.scala @@ -10,7 +10,7 @@ object Slave extends Actor { loop { react { case 'doWork => - println("Done") + Console.err.println("Done") reply('done) } } @@ -39,7 +39,7 @@ object Test { Master.start() react { case Exit(from, reason) if (from == Slave) => - println(Slave.getState) + Console.err.println(Slave.getState) } } } diff --git a/test/files/jvm/actor-uncaught-exception.check b/test/files/jvm/actor-uncaught-exception.check index 4bbd53ef6d..3e669779df 100644 --- a/test/files/jvm/actor-uncaught-exception.check +++ b/test/files/jvm/actor-uncaught-exception.check @@ -1,7 +1,5 @@ Uncaught exception in StartError MyException: I don't want to run! -StartError exited for reason UncaughtException(StartError,None,MyException: I don't want to run!) Uncaught exception in MessageError Message: 'ping MyException: No message for me! -MessageError exited for reason UncaughtException(MessageError,Some('ping),MyException: No message for me!) diff --git a/test/files/jvm/actor-uncaught-exception.scala b/test/files/jvm/actor-uncaught-exception.scala index e395638788..9f64be26e1 100644 --- a/test/files/jvm/actor-uncaught-exception.scala +++ b/test/files/jvm/actor-uncaught-exception.scala @@ -31,7 +31,6 @@ object Test { Actor.loop { react { case Exit(actor, reason) => - println(actor + " exited for reason " + reason) if (actor == StartError) MessageError ! 'ping else |