From 5a02faeb1f8da61b978a47a0fa74c9dc79fd167c Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 1 Aug 2020 20:00:27 +0200 Subject: [PATCH] Better names --- test/babashka/main_test.clj | 2 +- .../scripts/{child.bb => kill_child_processes.bb} | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) rename test/babashka/scripts/{child.bb => kill_child_processes.bb} (67%) diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj index 71697efa..84c32256 100644 --- a/test/babashka/main_test.clj +++ b/test/babashka/main_test.clj @@ -243,7 +243,7 @@ "LICENSE")) (testing "bb is able to kill subprocesses created by ProcessBuilder" (when test-utils/native? - (let [output (test-utils/bb nil (io/file "test" "babashka" "scripts" "child.bb")) + (let [output (test-utils/bb nil (io/file "test" "babashka" "scripts" "kill_child_processes.bb")) parsed (edn/read-string (format "[%s]" output))] (is (every? number? parsed)) (is (= 3 (count parsed))))))) diff --git a/test/babashka/scripts/child.bb b/test/babashka/scripts/kill_child_processes.bb similarity index 67% rename from test/babashka/scripts/child.bb rename to test/babashka/scripts/kill_child_processes.bb index bf30a346..67ed56b6 100644 --- a/test/babashka/scripts/child.bb +++ b/test/babashka/scripts/kill_child_processes.bb @@ -2,10 +2,13 @@ (set! *warn-on-reflection* true) -(defn handles [^java.lang.ProcessHandle x] - (distinct (cons x (mapcat handles (iterator-seq (.iterator (.descendants x))))))) +(defn child-process-handles [^java.lang.ProcessHandle x] + (distinct + (cons x + (mapcat child-process-handles + (iterator-seq (.iterator (.descendants x))))))) -(defn run [& args] +(defn start-spawning [& args] (let [depth (or (System/getenv "DEPTH") "0") depth (Integer/parseInt depth)] (when-not (= 4 depth) @@ -20,7 +23,7 @@ (run! (fn [^java.lang.ProcessHandle handle] (do (prn (.pid handle)) (.destroy handle))) - (handles (.toHandle proc)))) + (child-process-handles (.toHandle proc)))) (Thread/sleep 100000000)))))) -(run "./bb" *file*) +(start-spawning "./bb" *file*)