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

Slight cleanup in some tests involving examining the compute-restarts list for...

Slight cleanup in some tests involving examining the compute-restarts list for something other than ABORT restarts.
parent 47266cd5
No related branches found
No related tags found
No related merge requests found
...@@ -267,8 +267,8 @@ ...@@ -267,8 +267,8 @@
(handler-case (handler-case
(make-package "A") (make-package "A")
(error (c) (error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c)) (if (position 'abort (compute-restarts c)
:test (complement #'eq)) :key #'restart-name :test-not #'eq)
'success 'success
'failure))) 'failure)))
success) success)
...@@ -277,8 +277,8 @@ ...@@ -277,8 +277,8 @@
(handler-case (handler-case
(make-package "Q") (make-package "Q")
(error (c) (error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c)) (if (position 'abort (compute-restarts c)
:test (complement #'eq)) :key #'restart-name :test-not #'eq)
'success 'success
'failure))) 'failure)))
success) success)
...@@ -288,8 +288,8 @@ ...@@ -288,8 +288,8 @@
(progn (ignore-errors (delete-package "TEST1")) (progn (ignore-errors (delete-package "TEST1"))
(make-package "TEST1" :nicknames '("A"))) (make-package "TEST1" :nicknames '("A")))
(error (c) (error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c)) (if (position 'abort (compute-restarts c)
:test (complement #'eq)) :key #'restart-name :test-not #'eq)
'success 'success
'failure))) 'failure)))
success) success)
...@@ -299,8 +299,8 @@ ...@@ -299,8 +299,8 @@
(progn (ignore-errors (delete-package "TEST1")) (progn (ignore-errors (delete-package "TEST1"))
(make-package "TEST1" :nicknames '("Q"))) (make-package "TEST1" :nicknames '("Q")))
(error (c) (error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c)) (if (position 'abort (compute-restarts c)
:test (complement #'eq)) :key #'restart-name :test-not #'eq)
'success 'success
'failure))) 'failure)))
success) success)
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
program-error) program-error)
;; Names given to :export and :intern must be disjoint, ;; Names given to :export and :intern must be disjoint,
;; otherwise signal a package-error ;; otherwise signal a program-error
(deftest defpackage-23 (deftest defpackage-23
(ignore-errors (ignore-errors
(ignore-errors (delete-package "H")) (ignore-errors (delete-package "H"))
...@@ -493,9 +493,8 @@ ...@@ -493,9 +493,8 @@
(handler-case (handler-case
(eval '(defpackage "H" (:shadowing-import-from "G" "NOT-THERE"))) (eval '(defpackage "H" (:shadowing-import-from "G" "NOT-THERE")))
(package-error (c) (package-error (c)
(if (member 'abort (mapcar #'restart-name (if (position 'abort (compute-restarts c)
(compute-restarts c)) :key #'restart-name :test-not #'eq)
:test (complement #'eq))
'success 'success
'fail)) 'fail))
(error (c) c))) (error (c) c)))
...@@ -512,9 +511,8 @@ ...@@ -512,9 +511,8 @@
(handler-case (handler-case
(eval '(defpackage "H" (:import-from "G" "NOT-THERE"))) (eval '(defpackage "H" (:import-from "G" "NOT-THERE")))
(package-error (c) (package-error (c)
(if (member 'abort (mapcar #'restart-name (if (position 'abort (compute-restarts c)
(compute-restarts c)) :key #'restart-name :test-not #'eq)
:test (complement #'eq))
'success 'success
'fail)) 'fail))
(error (c) c))) (error (c) c)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment