summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-02-11 00:50:39 +0000
committerPaul Phillips <paulp@improving.org>2009-02-11 00:50:39 +0000
commit4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4 (patch)
tree7ce70e221bd9944d1c7d92de2197c5d594abcf68
parent347e682ba28c6cbec3169b450074b4f1d2fd4bd9 (diff)
downloadscala-4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4.tar.gz
scala-4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4.tar.bz2
scala-4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4.zip
moved timeout.scala back to pending and documen...
moved timeout.scala back to pending and documented why it's there
-rw-r--r--test/files/jvm/timeout.scala5
-rw-r--r--test/pending/jvm/timeout.check (renamed from test/files/jvm/timeout.check)0
-rw-r--r--test/pending/jvm/timeout.scala33
3 files changed, 38 insertions, 0 deletions
diff --git a/test/files/jvm/timeout.scala b/test/files/jvm/timeout.scala
index 12f1bd7bad..3005beab2c 100644
--- a/test/files/jvm/timeout.scala
+++ b/test/files/jvm/timeout.scala
@@ -1,3 +1,8 @@
+// Test is in pending because although it suceeds locally,
+// it takes too long on the machine which runs nightly tests.
+//
+// [partest] EXPECTED: 100 < x < 900
+// [partest] ACTUAL: 1519
import scala.actors.Actor._
import scala.actors.TIMEOUT
diff --git a/test/files/jvm/timeout.check b/test/pending/jvm/timeout.check
index d86bac9de5..d86bac9de5 100644
--- a/test/files/jvm/timeout.check
+++ b/test/pending/jvm/timeout.check
diff --git a/test/pending/jvm/timeout.scala b/test/pending/jvm/timeout.scala
new file mode 100644
index 0000000000..12f1bd7bad
--- /dev/null
+++ b/test/pending/jvm/timeout.scala
@@ -0,0 +1,33 @@
+
+import scala.actors.Actor._
+import scala.actors.TIMEOUT
+
+object Test extends Application {
+ case class Timing(time: Long)
+
+ actor {
+ val a = actor {
+ react {
+ case 'doTiming =>
+ val s = sender
+ reactWithin(500) {
+ case TIMEOUT =>
+ s ! Timing(System.currentTimeMillis)
+ }
+ }
+ }
+
+ val start = System.currentTimeMillis
+ (a !? 'doTiming) match {
+ case Timing(end) =>
+ val delay = end - start
+
+ if (delay > 100 && delay < 900)
+ println("OK")
+ else {
+ println("EXPECTED: 100 < x < 900")
+ println("ACTUAL: "+delay)
+ }
+ }
+ }
+}