Merge pull request #463 from arichiardi/runtests-ns-fix

Fix boot.test/runtests, ns-interns is evaluated at task execution

Author: micha

boot/core/build.boot

@@ -2,7 +2,7 @@
  :source-paths #{"test"}
  :dependencies '[[org.clojure/tools.reader "1.0.0-alpha2"]])
 
-(require '[boot.test :as test :refer [runtests test-report test-exit]]
+(require '[boot.test :refer [runtests test-report test-exit]]
          'boot.task.built-in-test
          'boot.test-test)
 
@@ -12,6 +12,6 @@
 
 (deftask test []
   (boot.util/info "Testing against version %s\n" (App/config "BOOT_VERSION"))
-  (comp (test/runtests)
-        (test/test-report)
-        (test/test-exit)))
+  (comp (runtests)
+        (test-report)
+        (test-exit)))

boot/core/src/boot/parallel.clj

@@ -122,7 +122,7 @@ The first item of the vector is timeout, the second unit"}
   (string/split command-str #"\s"))
 
 (defn task-sync-map
-  "Add batch-specific keys to the input sync map.
+  "Add task-specific keys to the input sync map.
 
   This function currently clones, adds keys and returns a HashMap whose
   values will be modified during the parallel computation. Make sure
@@ -206,7 +206,7 @@ The first item of the vector is timeout, the second unit"}
         sync-map (parallel-init-fn (empty-sync-map))
         seqs-of-cmds (partition-all n commands)
         seqs-of-midwares (map #(commands->parallel-task sync-map %) seqs-of-cmds)]
-    (util/dbug "Middleware command partitions: %s.\n" (vec seqs-of-cmds))
+    (util/dbug "Partitions: %s.\n" (vec seqs-of-cmds))
     (core/with-pre-wrap [fileset]
       (reduce (fn [prev-fs mw]
                 (let [handler (mw identity)] ;; this triggers the parallel computation

boot/core/src/boot/test.clj

@@ -253,21 +253,25 @@
    t threads    NUMBER        int    "The maximum number of threads to spawn during the tests."
    n namespaces NAMESPACE     #{sym} "The set of namespace symbols to run tests in."
    e exclusions NAMESPACE     #{sym} "The set of namespace symbols to be excluded from test."]
-  (let [commands (cond
-                   commands commands
-                   :default (->> (or (seq namespaces) (all-ns))
-                                 (remove (or exclusions #{}) )
-                                 (namespaces->vars test-me-pred)
-                                 (map var->command)))]
-    (if (seq commands)
-      (do (assert (every? string? commands)
-                  (format "commands must be strings, got %s" commands))
-          (binding [parallel/*parallel-hooks* {:init init-sync-map
-                                               :task-init task-sync-map}]
-            (parallel/runcommands :commands commands
-                                  :batches threads)))
-      (do (util/warn "No namespace was tested.")
-          identity))))
+  (assert (every? string? commands) (format "commands must be strings, got %s" commands))
+  (let [cmd-atom (atom commands)]
+    (comp (core/with-pass-thru _
+            (reset! cmd-atom (->> (or (seq namespaces) (all-ns))
+                                  (remove (or exclusions #{}))
+                                  (namespaces->vars test-me-pred)
+                                  (map var->command)
+                                  (into #{}))))
+          (core/with-pre-wrap fileset
+            (binding [parallel/*parallel-hooks* {:init init-sync-map
+                                                 :batch-init identity
+                                                 :task-init task-sync-map}]
+              (if-let [commands (seq @cmd-atom)]
+                (let [middleware (parallel/runcommands :commands commands
+                                                       :batches threads)]
+                  ;; Forcing execution of runcommands inside this task
+                  ((middleware identity) fileset))
+                (do (util/warn "No namespace was tested. Try to require your test namespaces before calling boot.test/runtests.\n")
+                    fileset)))))))
 
 (comment
   (reset! util/*verbosity* 2)
@@ -281,5 +285,4 @@
                                               "boot.task.built-in-test/sift-to-asset-invert-tests"
                                               "boot.task.built-in-test/sift-include-tests"})
                         (test-report)
-                        (test-exit)))
-  )
+                        (test-exit))))