diff options
| author | James Iry <jamesiry@gmail.com> | 2013-02-26 11:53:00 -0800 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-02-26 11:53:00 -0800 |
| commit | 8bccbef5b540b87f784e9d8eab0950e528e4199a (patch) | |
| tree | 21c590567adf89bc9dc59c15f676fd2e77506eb4 /test/files/jvm | |
| parent | c0b59a161140020343e6af05636f41a4dd2c99b0 (diff) | |
| parent | 3e0fbc0193f0b6f58dc16dae3824677e9902dc7b (diff) | |
| download | scala-8bccbef5b540b87f784e9d8eab0950e528e4199a.tar.gz scala-8bccbef5b540b87f784e9d8eab0950e528e4199a.tar.bz2 scala-8bccbef5b540b87f784e9d8eab0950e528e4199a.zip | |
Merge pull request #2170 from rkuhn/wip-duration-sleep-∂π
relax time constraint in duration-tck.scala (for Windows)
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 |