merge master

2 files changed, 14 insertions, 4 deletions

diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index 99075e36..052cbff8 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -1802,7 +1802,7 @@
     (apply concat (apply map f colls)))
 
 (defn filter
-  "Returns a lazy seq of the items in coll for which
+  "Returns a lazy sequence of the items in coll for which
   (pred item) returns true. pred must be free of side-effects."
   ([pred coll]
    (lazy-seq
diff --git a/src/clj/clojure/test.clj b/src/clj/clojure/test.clj
index 2a6826d2..3d09f23e 100644
--- a/src/clj/clojure/test.clj
+++ b/src/clj/clojure/test.clj
@@ -684,11 +684,14 @@
 
 (defn run-tests
   "Runs all tests in the given namespaces; prints results.
-  Defaults to current namespace if none given."
+  Defaults to current namespace if none given.  Returns a map
+  summarizing test results."
   ([] (run-tests *ns*))
   ([& namespaces]
-     (report (assoc (apply merge-with + (map test-ns namespaces))
-               :type :summary))))
+     (let [summary (assoc (apply merge-with + (map test-ns namespaces))
+                     :type :summary)]
+       (report summary)
+       summary)))
 
 (defn run-all-tests
   "Runs all tests in all namespaces; prints results.
@@ -697,3 +700,10 @@
   tested."
   ([] (apply run-tests (all-ns)))
   ([re] (apply run-tests (filter #(re-matches re (name (ns-name %))) (all-ns)))))
+
+(defn successful?
+  "Returns true if the given test summary indicates all tests
+  were successful, false otherwise."
+  [summary]
+  (and (zero? (:fail summary))
+       (zero? (:error summary))))