X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tests%2Fautomated%2Fdatabase-tests.el;h=84955ebedfdf1e35de0c6d34ddaced461533f130;hb=96ef0e2e32ec81ea7aeaa113d4ee0f40768e3fc4;hp=01d195a823bd3943c2fd65385bf89944d39fc63d;hpb=f3ec20f455f3f1212d2c5ee4cadc984330da9c38;p=chise%2Fxemacs-chise.git

diff --git a/tests/automated/database-tests.el b/tests/automated/database-tests.el
index 01d195a..84955eb 100644
--- 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.
 
-;;; Synched up with: not in FSF Emacs.
+;;; Synched up with: Not in FSF.
 
 ;;; Commentary:
 
@@ -36,8 +36,14 @@
      (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)))
@@ -45,18 +51,13 @@
 	(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))))
 
-    (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")
-	(test-database (open-database filename db-type))))
-    ))
+	(delete-database-files filename)
+	(test-database (open-database filename db-type))
+	(delete-database-files filename)))))