2.x: Fix flaky MaybeFromCallableTest.noErrorLoss (ReactiveX#5541)

akarnokd · web-flow · commit f61b2299d03b · 2017-08-08T16:34:46.000+02:00
* 2.x: Fix flaky MaybeFromCallableTest.noErrorLoss

* Fix the same error in 2 other Maybe tests.
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java
@@ -135,16 +135,14 @@ public void noErrorLoss() throws Exception {
                 @Override
                 public void run() throws Exception {
                     cdl1.countDown();
-                    cdl2.await();
+                    cdl2.await(5, TimeUnit.SECONDS);
                 }
             }).subscribeOn(Schedulers.single()).test();
 
             assertTrue(cdl1.await(5, TimeUnit.SECONDS));
 
             to.cancel();
 
-            cdl2.countDown();
-
             int timeout = 10;
 
             while (timeout-- > 0 && errors.isEmpty()) {
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java
@@ -138,7 +138,7 @@ public void noErrorLoss() throws Exception {
                 @Override
                 public Integer call() throws Exception {
                     cdl1.countDown();
-                    cdl2.await();
+                    cdl2.await(5, TimeUnit.SECONDS);
                     return 1;
                 }
             }).subscribeOn(Schedulers.single()).test();
@@ -147,8 +147,6 @@ public Integer call() throws Exception {
 
             to.cancel();
 
-            cdl2.countDown();
-
             int timeout = 10;
 
             while (timeout-- > 0 && errors.isEmpty()) {
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java
@@ -134,7 +134,7 @@ public void noErrorLoss() throws Exception {
                 public void run() {
                     cdl1.countDown();
                     try {
-                        cdl2.await();
+                        cdl2.await(5, TimeUnit.SECONDS);
                     } catch (InterruptedException ex) {
                         throw new RuntimeException(ex);
                     }
@@ -145,8 +145,6 @@ public void run() {
 
             to.cancel();
 
-            cdl2.countDown();
-
             int timeout = 10;
 
             while (timeout-- > 0 && errors.isEmpty()) {
