Skip to content

Commit 45b97b1

Browse files
fix bogus output when test library has no tests
1 parent 0722aee commit 45b97b1

1 file changed

Lines changed: 22 additions & 20 deletions

File tree

  • src/main/clojure/clojure/test/generative

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,26 @@
130130
(defn run-generative-tests
131131
"Run generative tests."
132132
[nses nthreads msec]
133-
(let [test-msec (quot msec (count (->> (apply find-vars-in-namespaces nses)
134-
(filter gentest?)
135-
seq)))]
136-
(doseq [ns nses]
137-
(when-let [fs (->> (find-vars-in-namespaces ns)
138-
(filter gentest?)
139-
seq)]
140-
(event/report :test/group
141-
:name ns
142-
:tags #{:begin}
143-
:test/threads nthreads
144-
:test/count (count fs))
145-
(try
146-
(run-batch
147-
fs
148-
nthreads
149-
test-msec)
150-
(finally
151-
(event/report :test/group :tags #{:end} :test/threads nthreads :test/count (count fs))))))))
133+
(let [c (count (->> (apply find-vars-in-namespaces nses)
134+
(filter gentest?)))]
135+
(when-not (zero? c)
136+
(let [test-msec (quot msec c)]
137+
(doseq [ns nses]
138+
(when-let [fs (->> (find-vars-in-namespaces ns)
139+
(filter gentest?)
140+
seq)]
141+
(event/report :test/group
142+
:name ns
143+
:tags #{:begin}
144+
:test/threads nthreads
145+
:test/count (count fs))
146+
(try
147+
(run-batch
148+
fs
149+
nthreads
150+
test-msec)
151+
(finally
152+
(event/report :test/group :tags #{:end} :test/threads nthreads :test/count (count fs))))))))))
152153

153154
(defn has-clojure-test-tests?
154155
[ns]
@@ -169,7 +170,8 @@
169170
@event-counts))
170171
ct-results (run-with-counts 'clojure.test
171172
#(binding [ctest/report cta/report-adapter]
172-
(apply ctest/run-tests (filter has-clojure-test-tests? nses))))
173+
(when-let [ctnses (seq (filter has-clojure-test-tests? nses))]
174+
(apply ctest/run-tests ctnses))))
173175
ctg-results (run-with-counts 'clojure.test.generative
174176
#(run-generative-tests nses threads msec))]
175177
(io/await)

0 commit comments

Comments
 (0)