Merge commit 'refs/pull/383/head' into develop

2 files changed, 20 insertions, 22 deletions

diff --git a/test/disabled/jvm/concurrent-future.check b/test/disabled/jvm/concurrent-future.check
index c55e824818..715ac90ce7 100644
--- a/test/disabled/jvm/concurrent-future.check
+++ b/test/disabled/jvm/concurrent-future.check
@@ -12,5 +12,3 @@ test6: hai world
 test6: kthxbye
 test7: hai world
 test7: kthxbye
-test8: hai world
-test8: im in yr loop
diff --git a/test/disabled/jvm/concurrent-future.scala b/test/disabled/jvm/concurrent-future.scala
index b44d054219..eda05428c8 100644
--- a/test/disabled/jvm/concurrent-future.scala
+++ b/test/disabled/jvm/concurrent-future.scala
@@ -90,25 +90,25 @@ object Test extends App {
     }
   }
 
-  def testOnFailureWhenFutureTimeoutException(): Unit = once {
-    done =>
-    val f = future[Unit] {
-      output(8, "hai world")
-      throw new FutureTimeoutException(null)
-    }
-    f onSuccess { case _ =>
-      output(8, "onoes")
-      done()
-    }
-    f onFailure {
-      case e: FutureTimeoutException =>
-        output(8, "im in yr loop")
-        done()
-      case other =>
-        output(8, "onoes: " + other)
-        done()
-    }
-  }
+  // def testOnFailureWhenFutureTimeoutException(): Unit = once {
+  //   done =>
+  //   val f = future[Unit] {
+  //     output(8, "hai world")
+  //     throw new FutureTimeoutException(null)
+  //   }
+  //   f onSuccess { case _ =>
+  //     output(8, "onoes")
+  //     done()
+  //   }
+  //   f onFailure {
+  //     case e: FutureTimeoutException =>
+  //       output(8, "im in yr loop")
+  //       done()
+  //     case other =>
+  //       output(8, "onoes: " + other)
+  //       done()
+  //   }
+  // }
 
   testOnSuccess()
   testOnSuccessWhenCompleted()
@@ -117,6 +117,6 @@ object Test extends App {
   testOnFailureWhenSpecialThrowable(5, new Error)
   testOnFailureWhenSpecialThrowable(6, new scala.util.control.ControlThrowable { })
   testOnFailureWhenSpecialThrowable(7, new InterruptedException)
-  testOnFailureWhenFutureTimeoutException()
+  // testOnFailureWhenFutureTimeoutException()
 
 }