diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-06-18 14:36:03 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-06-18 14:36:03 -0700 |
| commit | 60c531c77f2efbe6ff1ccbb0f07aa5e72592b6bd (patch) | |
| tree | 7a9f4c303b4472c6816133b242daf0d70ed9caf8 | |
| parent | 6f1ac2610ecd1d6b01406476781ba8cd836a95e4 (diff) | |
| parent | da1ae7adaff303617df9bac41331b78d5b1ff11b (diff) | |
| download | scala-60c531c77f2efbe6ff1ccbb0f07aa5e72592b6bd.tar.gz scala-60c531c77f2efbe6ff1ccbb0f07aa5e72592b6bd.tar.bz2 scala-60c531c77f2efbe6ff1ccbb0f07aa5e72592b6bd.zip | |
Merge pull request #2646 from retronym/topic/duration-relax-2.10.x
[backport] relax time constraint in duration-tck.scala (for Windows VMs)
| -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 |