Merge pull request #1797 from MenschNestor/master

Stabilize yet another test

Author: Tim Bozarth

Diff for: hystrix-core/src/test/java/com/netflix/hystrix/HystrixObservableCommandTest.java

@@ -2440,6 +2440,7 @@ public void testSynchronousExecutionTimeoutValueViaExecute() {
 
         System.out.println(">>>>> Begin: " + System.currentTimeMillis());
 
+        final AtomicBoolean startedExecution = new AtomicBoolean();
         HystrixObservableCommand<String> command = new HystrixObservableCommand<String>(properties) {
             @Override
             protected Observable<String> construct() {
@@ -2449,6 +2450,7 @@ protected Observable<String> construct() {
                     @Override
                     public void call(Subscriber<? super String> t1) {
                         try {
+                            startedExecution.set(true);
                             Thread.sleep(2000);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
@@ -2477,7 +2479,7 @@ protected Observable<String> resumeWithFallback() {
         assertEquals("expected fallback value", "timed-out", value);
 
         // Thread isolated
-        assertTrue(command.isExecutedInThread());
+        assertTrue(!startedExecution.get() || command.isExecutedInThread());
         assertNotNull(command.getExecutionException());
 
         assertEquals(0, command.metrics.getCurrentConcurrentExecutionCount());
@@ -2493,13 +2495,15 @@ public void testSynchronousExecutionUsingThreadIsolationTimeoutValueViaObserve()
                         .withExecutionIsolationStrategy(ExecutionIsolationStrategy.THREAD)
                         .withExecutionTimeoutInMilliseconds(50));
 
+        final AtomicBoolean startedExecution = new AtomicBoolean();
         HystrixObservableCommand<String> command = new HystrixObservableCommand<String>(properties) {
             @Override
             protected Observable<String> construct() {
                 return Observable.create(new OnSubscribe<String>() {
 
                     @Override
                     public void call(Subscriber<? super String> t1) {
+                        startedExecution.set(true);
                         try {
                             Thread.sleep(2000);
                         } catch (InterruptedException e) {
@@ -2527,7 +2531,7 @@ protected Observable<String> resumeWithFallback() {
         assertEquals("expected fallback value", "timed-out", value);
 
         // Thread isolated
-        assertTrue(command.isExecutedInThread());
+        assertTrue(!startedExecution.get() || command.isExecutedInThread());
         assertNotNull(command.getExecutionException());
 
         assertEquals(0, command.metrics.getCurrentConcurrentExecutionCount());