Merge pull request #276 from lambdaisland/cjohansen/fix-test-rebased2

Partially fix watch test bug

Author: alysbrooks

test/unit/kaocha/watch_test.clj

@@ -103,6 +103,7 @@
          (spit tmp-file "#kaocha/v1 {:tests [{:id :foo}]}")
          (first (w/reload-config {:kaocha/cli-options {:config-file (str tmp-file)}} []))))))
 
+
 (deftest watch-test
   (let [{:keys [config-file test-dir] :as m} (integration/test-dir-setup {})
         config (-> (config/load-config config-file)
@@ -112,26 +113,33 @@
         prefix (str (gensym "foo"))
         finish? (atom false)
         q       (w/make-queue)
-        out-str (promise)]
+        out-str (promise)
+        test-file-path (str "test/" prefix "/bar_test.clj")
+        ]
     (integration/spit-file m "tests.edn" (prn-str config))
-    (integration/spit-file m (str "test/" prefix "/bar_test.clj") (str "(ns " prefix ".bar-test (:require [clojure.test :refer :all])) (deftest xxx-test (is (= :xxx :yyy)))"))
+    (integration/spit-file m test-file-path (str "(ns " prefix ".bar-test (:require [clojure.test :refer :all])) (deftest xxx-test (is (= :xxx :yyy)))"))
 
     (future (deliver out-str (util/with-test-out-str
                                (t/with-test-out
                                  (util/with-test-ctx
                                    (w/run* config finish? q))))))
 
     (Thread/sleep 100)
-    (integration/spit-file m (str "test/" prefix "/bar_test.clj") (str "(ns " prefix ".bar-test (:require [clojure.test :refer :all])) (deftest xxx-test (is (= :xxx :zzz)))"))
-;;(w/qput q (.resolve (:dir m) (str "test/" prefix "/bar_test.clj")))
-    (Thread/sleep 100)
+    (integration/spit-file m test-file-path (str "(ns " prefix ".bar-test (:require [clojure.test :refer :all])) (deftest xxx-test (is (= :xxx :zzz)))"))
+    (w/qput q (.resolve (:dir m) test-file-path))
+    (Thread/sleep 500)
     (reset! finish? true)
     (w/qput q :finish)
+    (Thread/sleep 100)
 
-    (is (str/replace "[(F)]\n\nFAIL in foo.bar-test/xxx-test (bar_test.clj:1)\nExpected:\n  :xxx\nActual:\n  -:xxx +:yyy\n1 tests, 1 assertions, 1 failures.\n\n[watch] Reloading #{foo.bar-test}\n[watch] Re-running failed tests #{:foo.bar-test/xxx-test}\n[(F)]\n\nFAIL in foo.bar-test/xxx-test (bar_test.clj:1)\nExpected:\n  :xxx\nActual:\n  -:xxx +:zzz\n1 tests, 1 assertions, 1 failures.\n\n[watch] watching stopped.\n"
+    (is (str/includes?
+           @out-str
+          (str/replace
+             
+              "[(F)]\n\nFAIL in foo.bar-test/xxx-test (bar_test.clj:1)\nExpected:\n  :xxx\nActual:\n  -:xxx +:yyy\n1 tests, 1 assertions, 1 failures.\n\n[watch] Reloading #{foo.bar-test}\n[watch] Re-running failed tests #{:foo.bar-test/xxx-test}\n[(F)]\n\nFAIL in foo.bar-test/xxx-test (bar_test.clj:1)\nExpected:\n  :xxx\nActual:\n  -:xxx +:zzz"
+             
                      "foo"
-                     prefix)
-        @out-str)))
+                     prefix)))))
 
 (deftest ignore-files-merged
   (let [{:keys [_config-file test-dir] :as m} (integration/test-dir-setup {})]