Merge remote-tracking branch 'upstream/fxcollections_interop' into fxcollections_interop

thomasnield · thomasnield · commit 9383ed920f3e · 2016-03-15T08:46:17.000-05:00
diff --git a/src/test/java/rx/schedulers/JavaFxSchedulerTest.java b/src/test/java/rx/schedulers/JavaFxSchedulerTest.java
@@ -89,7 +89,7 @@ public void call() {
             }
         };
 
-        inner.schedulePeriodically(action, 50, 200, TimeUnit.MILLISECONDS);
+        inner.schedulePeriodically(action, 100, 400, TimeUnit.MILLISECONDS);
 
         if (!latch.await(1, TimeUnit.SECONDS)) {
             fail("timed out waiting for tasks to execute");

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void call() {`
`89`	`89`	`}`
`90`	`90`	`};`
`91`	`91`
`92`		`- inner.schedulePeriodically(action, 50, 200, TimeUnit.MILLISECONDS);`
	`92`	`+ inner.schedulePeriodically(action, 100, 400, TimeUnit.MILLISECONDS);`
`93`	`93`
`94`	`94`	`if (!latch.await(1, TimeUnit.SECONDS)) {`
`95`	`95`	`fail("timed out waiting for tasks to execute");`