X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tests%2Fautomated%2Fdatabase-tests.el;h=84955ebedfdf1e35de0c6d34ddaced461533f130;hb=804315b0b47c2f48a626f8030d0be4a99819eaa4;hp=7a46c343aa61f675521fe28f950c012f2a16bbbe;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git

diff --git a/tests/automated/database-tests.el b/tests/automated/database-tests.el
index 7a46c34..84955eb 100644
--- a/tests/automated/database-tests.el
+++ b/tests/automated/database-tests.el
@@ -22,22 +22,28 @@
 ;; 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:
 
 ;;; Test database functionality
 ;;; See test-harness.el
 
-(condition-case err
+(condition-case nil
     (require 'test-harness)
   (file-error
    (when (and (boundp 'load-file-name) (stringp load-file-name))
      (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")))
-      (condition-case nil (delete-file fn) (file-error nil)))
-
-    (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)))))