From 151afee40fb625f173bb90ee3ad8ad66f89c695d Mon Sep 17 00:00:00 2001
From: pfdietz <pfdietz@localhost>
Date: Mon, 26 Jan 2004 02:58:00 +0000
Subject: [PATCH] Use delete-all-versions for safety

---
 ansi-tests/rename-file.lsp         | 30 ++++++++++--------------------
 ansi-tests/stream-element-type.lsp |  8 ++++----
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/ansi-tests/rename-file.lsp b/ansi-tests/rename-file.lsp
index a62767a8..a910872e 100644
--- a/ansi-tests/rename-file.lsp
+++ b/ansi-tests/rename-file.lsp
@@ -8,10 +8,8 @@
 (deftest rename-file.1
   (let ((pn1 #p"file-to-be-renamed.txt")
 	(pn2 #p"file-that-was-renamed.txt"))
-    (when (probe-file pn1)
-      (delete-file pn1))
-    (when (probe-file pn2)
-      (delete-file pn2))
+    (delete-all-versions pn1)
+    (delete-all-versions pn2)
     (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
     (let ((results (multiple-value-list (rename-file pn1 pn2))))
       (destructuring-bind (defaulted-new-name old-truename new-truename)
@@ -33,10 +31,8 @@
 (deftest rename-file.2
   (let ((pn1 "file-to-be-renamed.txt")
 	(pn2 "file-that-was-renamed.txt"))
-    (when (probe-file pn1)
-      (delete-file pn1))
-    (when (probe-file pn2)
-      (delete-file pn2))
+    (delete-all-versions pn1)
+    (delete-all-versions pn2)
     (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
     (let ((results (multiple-value-list (rename-file pn1 pn2))))
       (destructuring-bind (defaulted-new-name old-truename new-truename)
@@ -63,10 +59,8 @@
 	 (pn2 (make-pathname :name "file-that-was-renamed"))
 	 (pn3 (make-pathname :name "file-that-was-renamed"
 			     :defaults pn1)))
-    (when (probe-file pn1)
-      (delete-file pn1))
-    (when (probe-file pn3)
-      (delete-file pn3))
+    (delete-all-versions pn1)
+    (delete-all-versions pn3)
     (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
     (let ((results (multiple-value-list (rename-file pn1 pn2))))
       (destructuring-bind (defaulted-new-name old-truename new-truename)
@@ -90,10 +84,8 @@
 (deftest rename-file.4
   (let ((pn1 "file-to-be-renamed.txt")
 	(pn2 "file-that-was-renamed.txt"))
-    (when (probe-file pn1)
-      (delete-file pn1))
-    (when (probe-file pn2)
-      (delete-file pn2))
+    (delete-all-versions pn1)
+    (delete-all-versions pn2)
     (let ((s (open pn1 :direction :output)))
       (format s "Whatever~%")
       (close s)
@@ -117,10 +109,8 @@
 (deftest rename-file.5
   (let ((pn1 "CLTEST:file-to-be-renamed.txt")
 	(pn2 "CLTEST:file-that-was-renamed.txt"))
-    (when (probe-file pn1)
-      (delete-file pn1))
-    (when (probe-file pn2)
-      (delete-file pn2))
+    (delete-all-versions pn1)
+    (delete-all-versions pn2)
     (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
     (let ((results (multiple-value-list (rename-file pn1 pn2))))
       (destructuring-bind (defaulted-new-name old-truename new-truename)
diff --git a/ansi-tests/stream-element-type.lsp b/ansi-tests/stream-element-type.lsp
index 54535d96..fdbc4bf7 100644
--- a/ansi-tests/stream-element-type.lsp
+++ b/ansi-tests/stream-element-type.lsp
@@ -19,7 +19,7 @@
   (let ((pn "foo.txt"))
     (loop for i from 1 to 100
 	  for etype = `(unsigned-byte ,i)
-	  for s = (progn (when (probe-file pn) (delete-file pn))
+	  for s = (progn (delete-all-versions pn)
 			 (open pn :direction :output
 			       :element-type etype))
 	  unless
@@ -34,7 +34,7 @@
   (let ((pn "foo.txt"))
     (loop for i from 1 to 100
 	  for etype = `(signed-byte ,i)
-	  for s = (progn (when (probe-file pn) (delete-file pn))
+	  for s = (progn (delete-all-versions pn)
 			 (open pn :direction :output
 			       :element-type etype))
 	  unless
@@ -49,7 +49,7 @@
   (let ((pn "foo.txt"))
     (loop for i from 1 to 100
 	  for etype = `(integer 0 ,i)
-	  for s = (progn (when (probe-file pn) (delete-file pn))
+	  for s = (progn (delete-all-versions pn)
 			 (open pn :direction :output
 			       :element-type etype))
 	  unless
@@ -63,7 +63,7 @@
 
 (deftest stream-element-type.5
   (let ((pn "foo.txt"))
-    (when (probe-file pn) (delete-file pn))
+    (delete-all-versions pn)
     (let ((s (open pn :direction :output)))
       (let ((etype (stream-element-type s)))
 	(unwind-protect
-- 
GitLab