--- a/tests/automated/database-tests.el	Mon Aug 13 11:10:04 2007 +0200
+++ b/tests/automated/database-tests.el	Mon Aug 13 11:10:50 2007 +0200
@@ -36,8 +36,11 @@
      (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")))
+	  (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 +48,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))
       (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)))))