[elephant-cvs] CVS elephant/tests

[ieslick]

Update of /project/elephant/cvsroot/elephant/tests
In directory clnet:/tmp/cvs-serv26243/tests

Modified Files:
	elephant-tests.lisp testmigration.lisp 
Log Message:
Migrate no longer has any dependency on memory size; improved migrate tests; cleaned up duplicate detection

--- /project/elephant/cvsroot/elephant/tests/elephant-tests.lisp	2007/03/11 05:45:17	1.28
+++ /project/elephant/cvsroot/elephant/tests/elephant-tests.lisp	2007/03/11 05:59:03	1.29
@@ -130,10 +130,9 @@
    test another backend"
   (when (and (consp spec) (symbolp (car spec)))
     (with-open-store (spec)
-      (cond ((eq (car spec) :bdb)
-	     (asdf:operate 'asdf:load-op :elephant-tests-bdb)))
-      (let ((*auto-commit* nil))
-	(do-tests)))))
+      (when (eq (car spec) :bdb)
+	(asdf:operate 'asdf:load-op :elephant-tests-bdb))
+      (do-tests))))
   
 (defun do-test-spec (testname &optional (spec *default-spec*))
   "For easy interactive running of single tests while debugging"
--- /project/elephant/cvsroot/elephant/tests/testmigration.lisp	2007/03/11 05:45:17	1.16
+++ /project/elephant/cvsroot/elephant/tests/testmigration.lisp	2007/03/11 05:59:03	1.17
@@ -35,16 +35,18 @@
 	  (format t "~%Single store mode: ignoring")
 	  t)
     (let* ((*store-controller*)
-	   (sc1 (open-store *test-spec-primary* :recover t))
-	   (sc2 (open-store *test-spec-secondary* :recover t)))
+	   (sc1 (open-store *test-spec-primary* :recover t :deadlock-detect t))
+	   (sc2 (open-store *test-spec-secondary* :recover t :deadlock-detect t)))
       (unwind-protect 
 	   (progn
-	     (elephant::initialize-migrate-duplicate-detection)
+	     (mapcar (lambda (x) 
+		       (disable-class-indexing x :sc sc1))
+		     '(idx-two idx-three idx-four idx-five idx-six idx-seven idx-eight
+		       idx-five-del stress-index idx-unbound-del))
 	     (add-to-root "x" "y" :store-controller sc1)
 	     (migrate sc2 sc1)
 	     (equal (get-from-root "x" :store-controller sc1)
 		    (get-from-root "x" :store-controller sc2)))
-	(elephant::clear-migrate-duplicate-detection)
 	(close-store sc1)
 	(close-store sc2))))
   t)