From cdb7cc02e4041f28e3bd9f0f78cf862f4b63e96f Mon Sep 17 00:00:00 2001 From: Konrad Mrożek <kmrozek@comscore.com> Date: Fri, 12 Jan 2024 13:16:08 +0000 Subject: [PATCH] Disable colors in malli pretty output --- clojure/src/test_runner.clj | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index e8cc9f9..eb7c47e 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -1,4 +1,7 @@ -(ns test-runner) +(ns test-runner + (:require + [clojure.string :as string] + [clojure.test :as t])) (def class-cache-dir ".cache/classes") (.mkdirs (java.io.File. class-cache-dir)) @@ -72,7 +75,9 @@ (println (str "ERROR-CONTINUE:ACTUAL:" (if (instance? Throwable (:actual m)) (ex-message (:actual m)) - (pr-str (:actual m)))))))) + (pr-str (:actual m))))) + (when (instance? Throwable (:actual m)) + (.printStackTrace (:actual m)))))) (defmethod vim-report :default [_]) @@ -109,6 +114,8 @@ (println "Malli detected. Instrument functions...") (require 'malli.dev) (require 'malli.dev.pretty) + (require 'malli.dev.virhe) + (alter-var-root (get (ns-publics 'malli.dev.virhe) '-color) (constantly (fn [_ body _] [:span body]))) ((find-var 'malli.dev/start!) {:report ((find-var 'malli.dev.pretty/thrower))})) (let [test-namespaces (->> (all-ns) (mapcat ns-publics) @@ -117,6 +124,16 @@ (filter (comp test-files :file)) (map :ns) (set))] + + (set-validator! #'t/*testing-contexts* + (let [validator (get-validator #'t/*testing-contexts*)] + (fn [v] + (println "Testing:" (string/join " " v)) + (println) + (if validator + (validator v) + true)))) + (with-redefs [t/report vim-report] (System/exit (if (pos? (if (and -test-file -test-line) -- Gitblit v1.9.3