summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRoland <rk@rkuhn.info>2013-02-25 23:41:33 +0100
committerRoland <rk@rkuhn.info>2013-02-26 09:40:27 +0100
commit3e0fbc0193f0b6f58dc16dae3824677e9902dc7b (patch)
treeeb742b5347170f73e836e08678ca75da5559d0e1 /test
parentf2be783020a1c8e05ebcae3717740632b41d1751 (diff)
downloadscala-3e0fbc0193f0b6f58dc16dae3824677e9902dc7b.tar.gz
scala-3e0fbc0193f0b6f58dc16dae3824677e9902dc7b.tar.bz2
scala-3e0fbc0193f0b6f58dc16dae3824677e9902dc7b.zip
relax time constraint in duration-tck.scala (for Windows VMs)
Diffstat (limited to 'test')
-rw-r--r--test/files/jvm/duration-tck.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/files/jvm/duration-tck.scala b/test/files/jvm/duration-tck.scala
index d0f13816a6..b2573448c7 100644
--- a/test/files/jvm/duration-tck.scala
+++ b/test/files/jvm/duration-tck.scala
@@ -176,8 +176,9 @@ object Test extends App {
Thread.sleep(1.second.toMillis)
- { val l = dead.timeLeft; assert(l <= 1.second, s"$l > 1.second") }
- { val l = dead2.timeLeft; assert(l <= 1.second, s"$l > 1.second") }
+ // unfortunately it can happen that the sleep() returns early without throwing
+ { val l = dead.timeLeft; assert(l <= 1100.millis, s"$l > 1100.millis") }
+ { val l = dead2.timeLeft; assert(l <= 1100.millis, s"$l > 1100.millis") }
// test integer mul/div