Merge pull request #3755 from akarnokd/FixtestErrorThrownIssue1685Again

1.x: fix attempt 2 for testErrorThrownIssue1685
ReactiveX · Mar 13, 2016 · 662ce3b · 662ce3b
2 parents a539151 + a3ca1fd
commit 662ce3b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/test/java/rx/ObservableTests.java b/src/test/java/rx/ObservableTests.java
@@ -1099,16 +1099,17 @@ public void uncaughtException(Thread t, Throwable e) {
                 }
             }).get();
 
+            subject.subscribe();
+
             Observable.error(new RuntimeException("oops"))
                 .materialize()
                 .delay(1, TimeUnit.SECONDS, s)
                 .dematerialize()
                 .subscribe(subject);
 
-            subject.subscribe();
             subject.materialize().toBlocking().first();
 
-            for (int i = 0; i < 20 && err.get() == null; i++) {
+            for (int i = 0; i < 50 && err.get() == null; i++) {
                 Thread.sleep(100); // the uncaught exception comes after the terminal event reaches toBlocking
             }