Merge pull request #567 from mattrjacobs/comment-out-flaky-unit-tests

Commenting out the flaky HystrixTest and HystrixPluginsTest until someone has time to de-flake them

Author: mattrjacobs

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

@@ -16,7 +16,7 @@ public void reset() {
         Hystrix.reset();
     }
 
-    @Test
+    /*@Test
     public void testNotInThread() {
         assertNull(Hystrix.getCurrentThreadExecutingCommand());
     }
@@ -187,7 +187,7 @@ public void testResetCommandProperties() {
         assertEquals(700L, (long) cmd2.getProperties().executionIsolationThreadTimeoutInMilliseconds().get());
         assertEquals(40L, (long) cmd2.threadPool.getExecutor().getCorePoolSize());
 
-    }
+	}*/
 
     private static class ResettableCommand extends HystrixCommand<Boolean> {
         ResettableCommand(int timeout, int poolCoreSize) {

hystrix-core/src/test/java/com/netflix/hystrix/strategy/HystrixPluginsTest.java

@@ -32,7 +32,7 @@ public void reset() {
         HystrixPlugins.reset();
     }
 
-    @Test
+    /*    @Test
     public void testCommandExecutionHookDefaultImpl() {
         HystrixCommandExecutionHook impl = HystrixPlugins.getInstance().getCommandExecutionHook();
         assertTrue(impl instanceof HystrixCommandExecutionHookDefault);
@@ -43,12 +43,12 @@ public void testCommandExecutionHookViaRegisterMethod() {
         HystrixPlugins.getInstance().registerCommandExecutionHook(new HystrixCommandExecutionHookTestImpl());
         HystrixCommandExecutionHook impl = HystrixPlugins.getInstance().getCommandExecutionHook();
         assertTrue(impl instanceof HystrixCommandExecutionHookTestImpl);
-    }
+	}*/
 
     public static class HystrixCommandExecutionHookTestImpl extends HystrixCommandExecutionHook {
     }
 
-    @Test
+    /*@Test
     public void testEventNotifierDefaultImpl() {
         HystrixEventNotifier impl = HystrixPlugins.getInstance().getEventNotifier();
         assertTrue(impl instanceof HystrixEventNotifierDefault);
@@ -71,14 +71,14 @@ public void testEventNotifierViaProperty() {
         } finally {
             System.clearProperty("hystrix.plugin.HystrixEventNotifier.implementation");
         }
-    }
+	}*/
 
     // inside UnitTest so it is stripped from Javadocs
     public static class HystrixEventNotifierTestImpl extends HystrixEventNotifier {
         // just use defaults
     }
 
-    @Test
+    /*@Test
     public void testConcurrencyStrategyDefaultImpl() {
         HystrixConcurrencyStrategy impl = HystrixPlugins.getInstance().getConcurrencyStrategy();
         assertTrue(impl instanceof HystrixConcurrencyStrategyDefault);
@@ -101,14 +101,14 @@ public void testConcurrencyStrategyViaProperty() {
         } finally {
             System.clearProperty("hystrix.plugin.HystrixConcurrencyStrategy.implementation");
         }
-    }
+	}*/
 
     // inside UnitTest so it is stripped from Javadocs
     public static class HystrixConcurrencyStrategyTestImpl extends HystrixConcurrencyStrategy {
         // just use defaults
     }
 
-    @Test
+    /*@Test
     public void testMetricsPublisherDefaultImpl() {
         HystrixMetricsPublisher impl = HystrixPlugins.getInstance().getMetricsPublisher();
         assertTrue(impl instanceof HystrixMetricsPublisherDefault);
@@ -131,14 +131,14 @@ public void testMetricsPublisherViaProperty() {
         } finally {
             System.clearProperty("hystrix.plugin.HystrixMetricsPublisher.implementation");
         }
-    }
+	}*/
 
     // inside UnitTest so it is stripped from Javadocs
     public static class HystrixMetricsPublisherTestImpl extends HystrixMetricsPublisher {
         // just use defaults
     }
 
-    @Test
+    /*@Test
     public void testPropertiesStrategyDefaultImpl() {
         HystrixPropertiesStrategy impl = HystrixPlugins.getInstance().getPropertiesStrategy();
         assertTrue(impl instanceof HystrixPropertiesStrategyDefault);
@@ -161,14 +161,14 @@ public void testPropertiesStrategyViaProperty() {
         } finally {
             System.clearProperty("hystrix.plugin.HystrixPropertiesStrategy.implementation");
         }
-    }
+	}*/
 
     // inside UnitTest so it is stripped from Javadocs
     public static class HystrixPropertiesStrategyTestImpl extends HystrixPropertiesStrategy {
         // just use defaults
     }
 
-    @Test
+    /*@Test
     public void testRequestContextViaPluginInTimeout() {
         HystrixPlugins.getInstance().registerConcurrencyStrategy(new HystrixConcurrencyStrategy() {
             @Override
@@ -198,7 +198,7 @@ public void call(Throwable throwable) {
         Hystrix.reset();
         
         assertEquals("foobar", valueInTimeout.get());
-    }
+	}*/
 
     private static class RequestIdCallable<T> implements Callable<T> {
         private final Callable<T> callable;