diff options
| author | Roland <rk@rkuhn.info> | 2013-02-25 23:41:33 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-06-10 06:02:59 -0400 |
| commit | da1ae7adaff303617df9bac41331b78d5b1ff11b (patch) | |
| tree | 0fc7ad49885fb04792cef351c91289b7ad76ffba /test/files/jvm | |
| parent | e3c318649c4318412c8d7e3cbee4689489f6ccb1 (diff) | |
| download | scala-da1ae7adaff303617df9bac41331b78d5b1ff11b.tar.gz scala-da1ae7adaff303617df9bac41331b78d5b1ff11b.tar.bz2 scala-da1ae7adaff303617df9bac41331b78d5b1ff11b.zip | |
[backport] relax time constraint in duration-tck.scala (for Windows VMs)
(cherry picked from commit 3e0fbc0193f0b6f58dc16dae3824677e9902dc7b)
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/duration-tck.scala | 5 |
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 |