serialize runner's default printing

Author: stuarthalloway

src/main/clojure/clojure/test/generative/runner.clj

@@ -9,7 +9,6 @@
 
 (ns clojure.test.generative.runner
   (:require
-   [clojure.pprint :as pprint]
    [clojure.tools.namespace :as ns]
    [clojure.data.generators :as gen]
    [clojure.test.generative :as tgen]))
@@ -26,7 +25,8 @@
        read-string
        10000]])
 
-(defn- config
+(defn config
+  "Returns runner configuration derived from system properties."
   []
   (reduce
    (fn [m [prop path coerce default]]
@@ -123,10 +123,34 @@
                      :seeds (repeatedly nthreads next-seed)})
           tests))
 
-(defn- prf
+(def ^:private serializer (agent nil))
+
+(defn serialized
+  "Returns a function that calls f for side effects, async,
+   serialized by an agent"
+  ([f] (serialized f serializer))
+  ([f agt]
+     (fn [& args]
+       (send-off agt
+                 (fn [_]
+                   (try
+                    (apply f args)
+                    (catch Throwable t
+                      (.printStackTrace t)))
+                   nil))
+       nil)))
+
+(def prf
   "Print and flush."
-  [s]
-  (print s) (flush))
+  (serialized (fn [s]
+                (binding [*out* *err*]
+                  (print s)
+                  (flush)))))
+
+(def print-stack-trace
+  (serialized (fn [^Throwable t] (.printStackTrace t))))
+
+(def sprn (serialized prn))
 
 (defn dir-tests
   "Returns all tests in dirs"
@@ -161,9 +185,9 @@
         ret (reduce
              (fn [{:keys [failures iters nresults]} result]
                (when (:exception result)
-                 (.printStackTrace ^Throwable (:exception result)))
+                 (print-stack-trace (:exception result)))
                (if (:exception result)
-                 (prn result)
+                 (sprn result)
                  (progress))
                {:failures (+ failures (if (:exception result) 1 0))
                 :iters (+ iters (:iter result))