Skip to content

Commit 8d1cecc

Browse files
committed
break tests as approach timeout so that don't fail on slow machines
1 parent 96786bb commit 8d1cecc

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/test/java/rx/BackpressureTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,13 @@ public void testFirehoseFailsAsExpected() {
419419

420420
@Test(timeout = 10000)
421421
public void testOnBackpressureDrop() {
422+
long t = System.currentTimeMillis();
422423
for (int i = 0; i < 100; i++) {
424+
// stop the test if we are getting close to the timeout because slow machines
425+
// may not get through 100 iterations
426+
if (System.currentTimeMillis() - t > TimeUnit.SECONDS.toMillis(9)) {
427+
break;
428+
}
423429
int NUM = (int) (RxRingBuffer.SIZE * 1.1); // > 1 so that take doesn't prevent buffer overflow
424430
AtomicInteger c = new AtomicInteger();
425431
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();

src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,11 @@ public void testSimpleOneLessAsyncLoop() {
224224
}
225225
@Test(timeout = 10000)
226226
public void testSimpleOneLessAsync() {
227+
long t = System.currentTimeMillis();
227228
for (int i = 2; i < 50; i++) {
229+
if (System.currentTimeMillis() - t > TimeUnit.SECONDS.toMillis(9)) {
230+
break;
231+
}
228232
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
229233
List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(i);
230234
Set<Integer> expected = new HashSet<Integer>(i);

0 commit comments

Comments
 (0)