Skip to content
Snippets Groups Projects
Commit 151afee4 authored by pfdietz's avatar pfdietz
Browse files

Use delete-all-versions for safety

parent 296361bc
No related branches found
No related tags found
No related merge requests found
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
(deftest rename-file.1 (deftest rename-file.1
(let ((pn1 #p"file-to-be-renamed.txt") (let ((pn1 #p"file-to-be-renamed.txt")
(pn2 #p"file-that-was-renamed.txt")) (pn2 #p"file-that-was-renamed.txt"))
(when (probe-file pn1) (delete-all-versions pn1)
(delete-file pn1)) (delete-all-versions pn2)
(when (probe-file pn2)
(delete-file pn2))
(with-open-file (s pn1 :direction :output) (format s "Whatever~%")) (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
(let ((results (multiple-value-list (rename-file pn1 pn2)))) (let ((results (multiple-value-list (rename-file pn1 pn2))))
(destructuring-bind (defaulted-new-name old-truename new-truename) (destructuring-bind (defaulted-new-name old-truename new-truename)
...@@ -33,10 +31,8 @@ ...@@ -33,10 +31,8 @@
(deftest rename-file.2 (deftest rename-file.2
(let ((pn1 "file-to-be-renamed.txt") (let ((pn1 "file-to-be-renamed.txt")
(pn2 "file-that-was-renamed.txt")) (pn2 "file-that-was-renamed.txt"))
(when (probe-file pn1) (delete-all-versions pn1)
(delete-file pn1)) (delete-all-versions pn2)
(when (probe-file pn2)
(delete-file pn2))
(with-open-file (s pn1 :direction :output) (format s "Whatever~%")) (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
(let ((results (multiple-value-list (rename-file pn1 pn2)))) (let ((results (multiple-value-list (rename-file pn1 pn2))))
(destructuring-bind (defaulted-new-name old-truename new-truename) (destructuring-bind (defaulted-new-name old-truename new-truename)
...@@ -63,10 +59,8 @@ ...@@ -63,10 +59,8 @@
(pn2 (make-pathname :name "file-that-was-renamed")) (pn2 (make-pathname :name "file-that-was-renamed"))
(pn3 (make-pathname :name "file-that-was-renamed" (pn3 (make-pathname :name "file-that-was-renamed"
:defaults pn1))) :defaults pn1)))
(when (probe-file pn1) (delete-all-versions pn1)
(delete-file pn1)) (delete-all-versions pn3)
(when (probe-file pn3)
(delete-file pn3))
(with-open-file (s pn1 :direction :output) (format s "Whatever~%")) (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
(let ((results (multiple-value-list (rename-file pn1 pn2)))) (let ((results (multiple-value-list (rename-file pn1 pn2))))
(destructuring-bind (defaulted-new-name old-truename new-truename) (destructuring-bind (defaulted-new-name old-truename new-truename)
...@@ -90,10 +84,8 @@ ...@@ -90,10 +84,8 @@
(deftest rename-file.4 (deftest rename-file.4
(let ((pn1 "file-to-be-renamed.txt") (let ((pn1 "file-to-be-renamed.txt")
(pn2 "file-that-was-renamed.txt")) (pn2 "file-that-was-renamed.txt"))
(when (probe-file pn1) (delete-all-versions pn1)
(delete-file pn1)) (delete-all-versions pn2)
(when (probe-file pn2)
(delete-file pn2))
(let ((s (open pn1 :direction :output))) (let ((s (open pn1 :direction :output)))
(format s "Whatever~%") (format s "Whatever~%")
(close s) (close s)
...@@ -117,10 +109,8 @@ ...@@ -117,10 +109,8 @@
(deftest rename-file.5 (deftest rename-file.5
(let ((pn1 "CLTEST:file-to-be-renamed.txt") (let ((pn1 "CLTEST:file-to-be-renamed.txt")
(pn2 "CLTEST:file-that-was-renamed.txt")) (pn2 "CLTEST:file-that-was-renamed.txt"))
(when (probe-file pn1) (delete-all-versions pn1)
(delete-file pn1)) (delete-all-versions pn2)
(when (probe-file pn2)
(delete-file pn2))
(with-open-file (s pn1 :direction :output) (format s "Whatever~%")) (with-open-file (s pn1 :direction :output) (format s "Whatever~%"))
(let ((results (multiple-value-list (rename-file pn1 pn2)))) (let ((results (multiple-value-list (rename-file pn1 pn2))))
(destructuring-bind (defaulted-new-name old-truename new-truename) (destructuring-bind (defaulted-new-name old-truename new-truename)
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
(let ((pn "foo.txt")) (let ((pn "foo.txt"))
(loop for i from 1 to 100 (loop for i from 1 to 100
for etype = `(unsigned-byte ,i) 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 (open pn :direction :output
:element-type etype)) :element-type etype))
unless unless
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
(let ((pn "foo.txt")) (let ((pn "foo.txt"))
(loop for i from 1 to 100 (loop for i from 1 to 100
for etype = `(signed-byte ,i) 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 (open pn :direction :output
:element-type etype)) :element-type etype))
unless unless
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
(let ((pn "foo.txt")) (let ((pn "foo.txt"))
(loop for i from 1 to 100 (loop for i from 1 to 100
for etype = `(integer 0 ,i) 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 (open pn :direction :output
:element-type etype)) :element-type etype))
unless unless
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
(deftest stream-element-type.5 (deftest stream-element-type.5
(let ((pn "foo.txt")) (let ((pn "foo.txt"))
(when (probe-file pn) (delete-file pn)) (delete-all-versions pn)
(let ((s (open pn :direction :output))) (let ((s (open pn :direction :output)))
(let ((etype (stream-element-type s))) (let ((etype (stream-element-type s)))
(unwind-protect (unwind-protect
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment