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
......@@ -267,8 +267,8 @@
(handler-case
(make-package "A")
(error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c))
:test (complement #'eq))
(if (position 'abort (compute-restarts c)
:key #'restart-name :test-not #'eq)
'success
'failure)))
success)
......@@ -277,8 +277,8 @@
(handler-case
(make-package "Q")
(error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c))
:test (complement #'eq))
(if (position 'abort (compute-restarts c)
:key #'restart-name :test-not #'eq)
'success
'failure)))
success)
......@@ -288,8 +288,8 @@
(progn (ignore-errors (delete-package "TEST1"))
(make-package "TEST1" :nicknames '("A")))
(error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c))
:test (complement #'eq))
(if (position 'abort (compute-restarts c)
:key #'restart-name :test-not #'eq)
'success
'failure)))
success)
......@@ -299,8 +299,8 @@
(progn (ignore-errors (delete-package "TEST1"))
(make-package "TEST1" :nicknames '("Q")))
(error (c)
(if (member 'abort (mapcar #'restart-name (compute-restarts c))
:test (complement #'eq))
(if (position 'abort (compute-restarts c)
:key #'restart-name :test-not #'eq)
'success
'failure)))
success)
......@@ -471,7 +471,7 @@
program-error)
;; Names given to :export and :intern must be disjoint,
;; otherwise signal a package-error
;; otherwise signal a program-error
(deftest defpackage-23
(ignore-errors
(ignore-errors (delete-package "H"))
......@@ -493,9 +493,8 @@
(handler-case
(eval '(defpackage "H" (:shadowing-import-from "G" "NOT-THERE")))
(package-error (c)
(if (member 'abort (mapcar #'restart-name
(compute-restarts c))
:test (complement #'eq))
(if (position 'abort (compute-restarts c)
:key #'restart-name :test-not #'eq)
'success
'fail))
(error (c) c)))
......@@ -512,9 +511,8 @@
(handler-case
(eval '(defpackage "H" (:import-from "G" "NOT-THERE")))
(package-error (c)
(if (member 'abort (mapcar #'restart-name
(compute-restarts c))
:test (complement #'eq))
(if (position 'abort (compute-restarts c)
:key #'restart-name :test-not #'eq)
'success
'fail))
(error (c) c)))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment