Merge pull request Netflix#155 from daveray/hystrix-clj-reset-fixture

Reset Hystrix after tests have run.
kmkr · Jul 24, 2013 · c7a30b8 · c7a30b8
2 parents 87c62c7 + cc2246a
commit c7a30b8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/hystrix-contrib/hystrix-clj/src/test/clojure/com/netflix/hystrix/core_test.clj b/hystrix-contrib/hystrix-clj/src/test/clojure/com/netflix/hystrix/core_test.clj
@@ -1,9 +1,19 @@
 (ns com.netflix.hystrix.core-test
   (:use com.netflix.hystrix.core)
   (:require [clojure.test :refer [deftest testing is are use-fixtures]])
-  (:import [com.netflix.hystrix HystrixExecutable]
+  (:import [com.netflix.hystrix Hystrix HystrixExecutable]
            [com.netflix.hystrix.strategy.concurrency HystrixRequestContext]))
 
+; reset hystrix after each execution, for consistency and sanity
+(defn reset-fixture
+  [f]
+  (try
+    (f)
+    (finally
+      (Hystrix/reset))))
+
+(use-fixtures :once reset-fixture)
+
 ; wrap each test in hystrix context
 (defn request-context-fixture
   [f]