From d937545d69736a906fdb549b75bdf2b8e005e287 Mon Sep 17 00:00:00 2001 From: Konrad Mrożek <kmrozek@comscore.com> Date: Thu, 31 Aug 2023 10:20:20 +0000 Subject: [PATCH] Handle exit code correctly --- clojure/src/test_runner.clj | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index 718abdd..af558db 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -91,7 +91,8 @@ (when (find-ns 'malli.core) (println "Malli detected. Instrument functions...") (require 'malli.dev) - ((find-var 'malli.dev/start!))) + (require 'malli.dev.pretty) + ((find-var 'malli.dev/start!) {:report ((find-var 'malli.dev.pretty/thrower))})) (let [test-namespaces (->> (all-ns) (mapcat ns-publics) (map (comp meta second)) @@ -103,10 +104,14 @@ (System/exit (if (pos? (if (and -test-file -test-line) - (let [results (t/run-test-var (find-closest-test (.. (java.io.File. -test-file) getAbsolutePath) - (parse-long -test-line)))] - (+ (:fail results 0) - (:error results 0))) + (if-let [test-var (find-closest-test (.. (java.io.File. -test-file) getAbsolutePath) + (parse-long -test-line))] + (->> (t/run-test-var test-var) + ((juxt :fail :error)) + (apply +)) + (do + (println "No test found") + 0)) (reduce (fn [total-fails n] (let [results (t/run-tests n)] (+ total-fails @@ -116,6 +121,3 @@ test-namespaces))) 1 0))))))) - - - -- Gitblit v1.9.3