[#22] delete-tree must be omnipotent

babashka · Apr 10, 2021 · 56a2c7e · 56a2c7e
1 parent 19c0397
commit 56a2c7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/babashka/fs.cljc b/src/babashka/fs.cljc
@@ -451,13 +451,14 @@
 (defn delete-tree
   "Deletes a file tree using walk-file-tree. Similar to rm -rf. Does not follow symlinks."
   [root]
-  (walk-file-tree root
-                  {:visit-file (fn [path _]
-                                 (delete path)
-                                 :continue)
-                   :post-visit-dir (fn [path _]
-                                     (delete path)
-                                     :continue)}))
+  (when (exists? root)
+    (walk-file-tree root
+                    {:visit-file (fn [path _]
+                                   (delete path)
+                                   :continue)
+                     :post-visit-dir (fn [path _]
+                                       (delete path)
+                                       :continue)})))
 
 (defn create-file
   "Creates empty file using Files#createFile."

diff --git a/test/babashka/fs_test.clj b/test/babashka/fs_test.clj
@@ -161,7 +161,10 @@
     (fs/create-file (fs/file nested-dir "tmp-file"))
     (is (fs/exists? tmp-file))
     (fs/delete-tree nested-dir)
-    (is (not (fs/exists? nested-dir))))
+    (is (not (fs/exists? nested-dir)))
+    (testing "No exception when tree doesn't exist"
+      (is (do (fs/delete-tree nested-dir)
+              true))))
   (when-not windows?
     (testing "delete-tree does not follow symlinks"
       (let [tmp-dir1 (temp-dir)