X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=edbb2eb2eca4d69b3c2b2d4c07b847b89b13619f;hb=8b5250e14e3280bdc4641c3b35a8dc68ca4dbde7;hp=da6063337677cdb49bb2cbce91b7bdacb0a721c5;hpb=967266c94b00f91e5967b8330fe2b9134b0c0447;p=clsql.git diff --git a/tests/test-init.lisp b/tests/test-init.lisp index da60633..edbb2eb 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -137,8 +137,8 @@ :make-default t :if-exists :old) - (unless (db-backend-has-create/destroy-db? db-type) - (truncate-database :database *default-database*)) + ;; Ensure database is empty + (truncate-database :database *default-database*) (setf *test-database-underlying-type* (clsql-sys:database-underlying-type *default-database*)) @@ -371,15 +371,15 @@ (dolist (test-form test-forms) (eval test-form)) - (let ((remaining (rtest:do-tests *report-stream*))) - (when (rt:pending-tests) + (let ((remaining (regression-test:do-tests *report-stream*))) + (when (regression-test:pending-tests) (incf *error-count* (length remaining)))) (let ((sexp-error (list db-type *test-database-underlying-type* (get-universal-time) (length test-forms) - (rt:pending-tests) + (regression-test:pending-tests) (lisp-implementation-type) (lisp-implementation-version) (machine-type))))