Fix TimeoutInputStreamTest, TimeoutOutputStreamTest assertions

If the build server is really busy, we might wait longer than 250 ms
before being interrupted, simply because one of our threads couldn't
be scheduled onto a CPU.  Don't make that cause a test failure.
Instead tolerate longer than expected waits, but not shorter waits.

Change-Id: I64511eec24b49e33928451e4c8b8c124eddaf0c2
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutInputStreamTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutInputStreamTest.java
index b854ae4e4e59c5693db983c6b29806aac93b20ed..b4a6a6a9baa67b3bbdadce13c23e80119eead951 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutInputStreamTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, Google Inc.
+ * Copyright (C) 2009-2010, Google Inc.
  * and other copyright owners as documented in the project's IP log.
  *
  * This program and the accompanying materials are made available
@@ -170,7 +170,7 @@ public class TimeoutInputStreamTest extends TestCase {
                // 50 ms of the expected timeout.
                //
                final long wait = now() - start;
-               assertTrue(Math.abs(wait - timeout) < 50);
+               assertTrue("waited only " + wait + " ms", timeout - wait < 50);
        }
 
        private static List<Thread> active() {

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutOutputStreamTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutOutputStreamTest.java
index 7563fc8c3b33e880670e04b76434a498576b06b3..f7afd21abc738127f45e1d3d93a3bd896f7c0e23 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutOutputStreamTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutOutputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, Google Inc.
+ * Copyright (C) 2009-2010, Google Inc.
  * and other copyright owners as documented in the project's IP log.
  *
  * This program and the accompanying materials are made available
@@ -251,7 +251,7 @@ public class TimeoutOutputStreamTest extends TestCase {
                // 50 ms of the expected timeout.
                //
                final long wait = now() - start;
-               assertTrue(Math.abs(wait - timeout) < 50);
+               assertTrue("waited only " + wait + " ms", timeout - wait < 50);
        }
 
        private static List<Thread> active() {