projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U+602A): Add `<-denotational@usage' for BUCS+602A; apply new
[chise/xemacs-chise.git]
/
tests
/
automated
/
database-tests.el
diff --git
a/tests/automated/database-tests.el
b/tests/automated/database-tests.el
index
01d195a
..
84955eb
100644
(file)
--- a/
tests/automated/database-tests.el
+++ b/
tests/automated/database-tests.el
@@
-22,7
+22,7
@@
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.
-;;; Synched up with: not in FSF Emacs.
+;;; Synched up with: Not in FSF.
;;; Commentary:
;;; Commentary:
@@
-36,8
+36,14
@@
(push (file-name-directory load-file-name) load-path)
(require 'test-harness))))
(push (file-name-directory load-file-name) load-path)
(require 'test-harness))))
-(flet ((test-database
- (db)
+(flet ((delete-database-files (filename)
+ (dolist (fn (list filename
+ (concat filename ".db")
+ (concat filename ".pag")
+ (concat filename ".dir")))
+ (ignore-file-errors (delete-file fn))))
+
+ (test-database (db)
(Assert (databasep db))
(put-database "key1" "val1" db)
(Assert (equal "val1" (get-database "key1" db)))
(Assert (databasep db))
(put-database "key1" "val1" db)
(Assert (equal "val1" (get-database "key1" db)))
@@
-45,18
+51,13
@@
(Assert (equal nil (get-database "key1" db)))
(close-database db)
(Assert (not (database-live-p db)))
(Assert (equal nil (get-database "key1" db)))
(close-database db)
(Assert (not (database-live-p db)))
- (Assert (databasep db))
- (let ((filename (database-file-name db)))
- (dolist (fn (list filename (concat filename ".db")))
- (condition-case nil (delete-file fn) (file-error nil))))))
+ (Assert (databasep db))))
(let ((filename (expand-file-name "test-harness" (temp-directory))))
(let ((filename (expand-file-name "test-harness" (temp-directory))))
- (dolist (fn (list filename (concat filename ".db")))
- (ignore-file-errors (delete-file fn)))
-
- (dolist (db-type `(dbm berkeley-db))
+ (dolist (db-type '(dbm berkeley-db))
(when (featurep db-type)
(princ "\n")
(when (featurep db-type)
(princ "\n")
- (test-database (open-database filename db-type))))
- ))
+ (delete-database-files filename)
+ (test-database (open-database filename db-type))
+ (delete-database-files filename)))))