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

Modified Files: testconditions.lisp Log Message: Fixed bug when two stores not set in new test

--- /project/elephant/cvsroot/elephant/tests/testconditions.lisp 2007/04/21 17:26:37 1.1 +++ /project/elephant/cvsroot/elephant/tests/testconditions.lisp 2007/04/22 03:02:35 1.2 @@ -18,19 +18,18 @@ (null *test-spec-secondary*)) (progn (format t "~%Second store spec missing: ignoring") - t) + (values t t t t)) (let (*store-controller* (sc1 (open-store *test-spec-primary* :recover t :deadlock-detect nil)) (sc2 (open-store *test-spec-secondary* :recover t :deadlock-detect nil))) (unwind-protect - (progn - (let ((inst1 (make-instance 'pfoo :slot1 100 :sc sc1)) - (inst2 (make-instance 'pfoo :slot1 200 :sc sc2))) - (values - (is-not-null (add-to-root 'inst1 inst1 :sc sc1)) - (is-not-null (add-to-root 'inst2 inst2 :sc sc2)) - (signals-condition (add-to-root 'inst1 inst1 :sc2)) - (signals-condition (add-to-root 'inst2 inst2 :sc1))))) + (let ((inst1 (make-instance 'pfoo :slot1 100 :sc sc1)) + (inst2 (make-instance 'pfoo :slot1 200 :sc sc2))) + (values + (is-not-null (add-to-root 'inst1 inst1 :sc sc1)) + (is-not-null (add-to-root 'inst2 inst2 :sc sc2)) + (signals-condition (add-to-root 'inst1 inst1 :sc2)) + (signals-condition (add-to-root 'inst2 inst2 :sc1)))) (close-store sc1) (close-store sc2)))) t t t t) \ No newline at end of file