Merge pull request #2572 from akarnokd/TestsMoreTime

Give more time to certain concurrency tests.
ReactiveX · Jan 30, 2015 · cdadc2a · cdadc2a
2 parents a0549a8 + 285ed87
commit cdadc2a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/test/java/rx/internal/operators/OperatorRetryTest.java b/src/test/java/rx/internal/operators/OperatorRetryTest.java
@@ -682,7 +682,7 @@ public void testTimeoutWithRetry() {
         assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get());
     }
 
-    @Test(timeout = 10000)
+    @Test(timeout = 15000)
     public void testRetryWithBackpressure() throws InterruptedException {
         final int NUM_RETRIES = RxRingBuffer.SIZE * 2;
         for (int i = 0; i < 400; i++) {
@@ -705,7 +705,7 @@ public void testRetryWithBackpressure() throws InterruptedException {
             inOrder.verifyNoMoreInteractions();
         }
     }
-    @Test(timeout = 10000)
+    @Test(timeout = 15000)
     public void testRetryWithBackpressureParallel() throws InterruptedException {
         final int NUM_RETRIES = RxRingBuffer.SIZE * 2;
         int ncpu = Runtime.getRuntime().availableProcessors();

diff --git a/src/test/java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java
@@ -503,7 +503,7 @@ public void run() {
 
         t.join();
     }
-    @Test(timeout = 5000)
+    @Test(timeout = 10000)
     public void testConcurrentSizeAndHasAnyValueTimeBounded() throws InterruptedException {
         final ReplaySubject<Object> rs = ReplaySubject.createWithTime(1, TimeUnit.MILLISECONDS, Schedulers.computation());
         final CyclicBarrier cb = new CyclicBarrier(2);

diff --git a/src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java
@@ -407,7 +407,7 @@ public void call() {
             worker.unsubscribe();
         }
     }
-    @Test(timeout = 5000)
+    @Test(timeout = 10000)
     public void testConcurrentSizeAndHasAnyValue() throws InterruptedException {
         final ReplaySubject<Object> rs = ReplaySubject.create();
         final CyclicBarrier cb = new CyclicBarrier(2);