summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2009-05-28 09:10:26 +0000
committerPhilipp Haller <hallerp@gmail.com>2009-05-28 09:10:26 +0000
commitc8ef95caee7a4cb0123cd73de1ca3e79459da160 (patch)
tree7c71978aec38f15ea0786ee6ad78050554c695f8 /test/files
parent503d8c26b9c75a7689cfecee07803e4cd0d21401 (diff)
downloadscala-c8ef95caee7a4cb0123cd73de1ca3e79459da160.tar.gz
scala-c8ef95caee7a4cb0123cd73de1ca3e79459da160.tar.bz2
scala-c8ef95caee7a4cb0123cd73de1ca3e79459da160.zip
Simpler log message for daemon actor test.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/daemon-actor-termination.check4
-rw-r--r--test/files/jvm/daemon-actor-termination.scala6
2 files changed, 5 insertions, 5 deletions
diff --git a/test/files/jvm/daemon-actor-termination.check b/test/files/jvm/daemon-actor-termination.check
index 22cb38fd7d..b2ff72fd0b 100644
--- a/test/files/jvm/daemon-actor-termination.check
+++ b/test/files/jvm/daemon-actor-termination.check
@@ -1,2 +1,2 @@
-I'm going to make you wait.
-I'm tired of waiting for you. Good bye.
+MSG1
+MSG2
diff --git a/test/files/jvm/daemon-actor-termination.scala b/test/files/jvm/daemon-actor-termination.scala
index c3dd58e253..824bd76211 100644
--- a/test/files/jvm/daemon-actor-termination.scala
+++ b/test/files/jvm/daemon-actor-termination.scala
@@ -13,15 +13,15 @@ object Test {
class MyDaemon extends DaemonActor {
def act() {
- println("I'm going to make you wait.")
+ println("MSG1")
Thread.sleep(5000)
- println("Ok, I'm done.")
+ println("done")
}
}
def main(args: Array[String]) {
val daemon = new MyDaemon
daemon.start()
Thread.sleep(500) // give the daemon a chance to start
- println("I'm tired of waiting for you. Good bye.")
+ println("MSG2")
}
}