From 285ed87f177a9006330c59461ae962f811aae613 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Fri, 30 Jan 2015 10:53:57 +0100 Subject: [PATCH] Give more time to certain concurrency tests. --- src/test/java/rx/internal/operators/OperatorRetryTest.java | 4 ++-- .../java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java | 2 +- src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/rx/internal/operators/OperatorRetryTest.java b/src/test/java/rx/internal/operators/OperatorRetryTest.java index 32a3e8f8ed..4be71c834d 100644 --- 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 index 9bc3e47823..5c326cdd92 100644 --- 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 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 index cc99eb737d..a90c5ac0f3 100644 --- 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 rs = ReplaySubject.create(); final CyclicBarrier cb = new CyclicBarrier(2);