managed to move timeout.scala the whole way int...

managed to move timeout.scala the whole way into pending

2 files changed, 5 insertions, 38 deletions

diff --git a/test/files/jvm/timeout.scala b/test/files/jvm/timeout.scala
deleted file mode 100644
index 3005beab2c..0000000000
--- a/test/files/jvm/timeout.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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
-
-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)
-        }
-    }
-  }
-}
diff --git a/test/pending/jvm/timeout.scala b/test/pending/jvm/timeout.scala
index 12f1bd7bad..3005beab2c 100644
--- a/test/pending/jvm/timeout.scala
+++ b/test/pending/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