Merge pull request #1490 from benjchristensen/unit-tests

benjchristensen · benjchristensen · commit bc806a8b6c3d · 2014-07-22T23:32:00.000-07:00
non-deterministic timeouts on slow machines
diff --git a/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryTest.java
@@ -351,7 +351,7 @@ public void onNext(T v) {
         }
     }
 
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void testUnsubscribeAfterError() {
 
         @SuppressWarnings("unchecked")
@@ -378,7 +378,7 @@ public void testUnsubscribeAfterError() {
         assertEquals("Only 1 active subscription", 1, so.maxActive.get());
     }
 
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void testTimeoutWithRetry() {
 
         @SuppressWarnings("unchecked")
diff --git a/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java
@@ -217,7 +217,7 @@ public void call(Integer n) {
         assertEquals(1, count.get());
     }
     
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void testUnsubscribeAfterError() {
 
         @SuppressWarnings("unchecked")
@@ -244,7 +244,7 @@ public void testUnsubscribeAfterError() {
         assertEquals("Only 1 active subscription", 1, so.maxActive.get());
     }
 
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void testTimeoutWithRetry() {
 
         @SuppressWarnings("unchecked")

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public void onNext(T v) {`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
`354`		`- @Test(timeout = 1000)`
	`354`	`+ @Test(timeout = 10000)`
`355`	`355`	`public void testUnsubscribeAfterError() {`
`356`	`356`
`357`	`357`	`@SuppressWarnings("unchecked")`
`@@ -378,7 +378,7 @@ public void testUnsubscribeAfterError() {`
`378`	`378`	`assertEquals("Only 1 active subscription", 1, so.maxActive.get());`
`379`	`379`	`}`
`380`	`380`
`381`		`- @Test(timeout = 1000)`
	`381`	`+ @Test(timeout = 10000)`
`382`	`382`	`public void testTimeoutWithRetry() {`
`383`	`383`
`384`	`384`	`@SuppressWarnings("unchecked")`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public void call(Integer n) {`
`217`	`217`	`assertEquals(1, count.get());`
`218`	`218`	`}`
`219`	`219`
`220`		`- @Test(timeout = 1000)`
	`220`	`+ @Test(timeout = 10000)`
`221`	`221`	`public void testUnsubscribeAfterError() {`
`222`	`222`
`223`	`223`	`@SuppressWarnings("unchecked")`
`@@ -244,7 +244,7 @@ public void testUnsubscribeAfterError() {`
`244`	`244`	`assertEquals("Only 1 active subscription", 1, so.maxActive.get());`
`245`	`245`	`}`
`246`	`246`
`247`		`- @Test(timeout = 1000)`
	`247`	`+ @Test(timeout = 10000)`
`248`	`248`	`public void testTimeoutWithRetry() {`
`249`	`249`
`250`	`250`	`@SuppressWarnings("unchecked")`