Failing unit tests for timeouts on HystrixCommands not causing thread…

… interruptions

Conflicts:
	hystrix-core/src/test/java/com/netflix/hystrix/HystrixCommandTest.java

hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java

@@ -948,7 +948,6 @@ public void tick() {
 
                         timeoutRunnable.run();
                     }
-
                 }
 
                 @Override

hystrix-core/src/test/java/com/netflix/hystrix/HystrixCommandTest.java

@@ -5273,7 +5273,7 @@ public void call(Throwable t1) {
     }
 
     @Test
-    public void testExceptionConvertedToBadRequestExceptionInExecutionHookBypassesCircuitBreaker(){
+    public void testExceptionConvertedToBadRequestExceptionInExecutionHookBypassesCircuitBreaker() {
         TestCircuitBreaker circuitBreaker = new TestCircuitBreaker();
         try {
             new ExceptionToBadRequestByExecutionHookCommand(circuitBreaker, ExecutionIsolationStrategy.THREAD).execute();
@@ -5292,6 +5292,33 @@ public void testExceptionConvertedToBadRequestExceptionInExecutionHookBypassesCi
         assertEquals(1, circuitBreaker.metrics.getRollingCount(HystrixRollingNumberEvent.BAD_REQUEST));
     }
 
+    @Test
+    public void testInterruptFutureOnTimeout() throws InterruptedException, ExecutionException {
+        // given
+        InterruptibleCommand cmd = new InterruptibleCommand(new TestCircuitBreaker());
+
+        // when
+        Future<Boolean> f = cmd.queue();
+
+        // then
+        Thread.sleep(3000);
+        System.out.println("RESULT : " + f.get());
+        assertTrue(cmd.hasBeenInterrupted());
+    }
+
+    @Test
+    public void testInterruptObservableOnTimeout() throws InterruptedException {
+        // given
+        InterruptibleCommand cmd = new InterruptibleCommand(new TestCircuitBreaker());
+
+        // when
+        cmd.observe().subscribe();
+
+        // then
+        Thread.sleep(3000);
+        assertTrue(cmd.hasBeenInterrupted());
+    }
+
     /* ******************************************************************************** */
     /* ******************************************************************************** */
     /* private HystrixCommand class implementations for unit testing */
@@ -6288,6 +6315,39 @@ protected Boolean run() throws Exception {
 
     }
 
+    private static class InterruptibleCommand extends TestHystrixCommand<Boolean> {
+
+        public InterruptibleCommand(TestCircuitBreaker circuitBreaker) {
+            super(testPropsBuilder()
+                    .setCircuitBreaker(circuitBreaker).setMetrics(circuitBreaker.metrics)
+                    .setCommandPropertiesDefaults(HystrixCommandPropertiesTest.getUnitTestPropertiesSetter()
+                            .withExecutionIsolationThreadInterruptOnTimeout(true)
+                            .withExecutionIsolationThreadTimeoutInMilliseconds(100)));
+        }
+
+        private volatile boolean hasBeenInterrupted;
+
+        public boolean hasBeenInterrupted()
+        {
+            return hasBeenInterrupted;
+        }
+
+        @Override
+        protected Boolean run() throws Exception
+        {
+            try {
+                Thread.sleep(2000);
+            }
+            catch (InterruptedException e) {
+                System.out.println("Interrupted!");
+                e.printStackTrace();
+                hasBeenInterrupted = true;
+            }
+
+            return hasBeenInterrupted;
+        }
+    }
+
     enum CommandKeyForUnitTest implements HystrixCommandKey {
         KEY_ONE, KEY_TWO
     }