Changeset 1749 for trunk/pylucid_project/tests

Timestamp:

09/09/08 14:55:25 (18 months ago)

Author:

JensDiemer

Message:

django updates

Files:

• trunk/pylucid_project/tests/__init__.py (modified) (5 diffs)

trunk/pylucid_project/tests/__init__.py

@@ -100 +100 @@
 os.environ['DJANGO_SETTINGS_MODULE'] = "PyLucid.settings"
 
-from django.test.utils import setup_test_environment, teardown_test_environment
-from django.test.utils import create_test_db, destroy_test_db
-
 from django.conf import settings
-
+from django.db import connection
 from django.core.cache import cache
 from django.test import TestCase as DjangoTestCase
 from django.contrib.auth.models import User, UNUSABLE_PASSWORD
+from django.test.utils import setup_test_environment, teardown_test_environment
 
 from tests.utils.BrowserDebug import debug_response
@@ -117 +115 @@
 from PyLucid.models import Page, Style, Template, Plugin
 from PyLucid.system.plugin_manager import auto_install_plugins, install_plugin
-
 
 # Display invalid (e.g. misspelled, unused) template variables
@@ -533 +530 @@
 def remove_unittest_plugin():
     print "remove unittest plugin (%s)" % TEST_PLUGIN_DST
-    shutil.rmtree(os.path.abspath(TEST_PLUGIN_DST))
+    try:
+        shutil.rmtree(os.path.abspath(TEST_PLUGIN_DST))
+    except Exception, err:
+        print "Error:", err
 
 
@@ -742 +742 @@
     """
     print "test start."
-    settings.DEBUG = False
+    settings.DEBUG = False   
     setup_test_environment()
     old_name = settings.DATABASE_NAME
-    db_name = create_test_db(verbosity=1, autoclobber=not interactive)
+    db_name = connection.creation.create_test_db(
+        verbosity=1, autoclobber=not interactive
+    )
+    print "Test database '%s' created" % db_name  
     init_pyluciddb(verbosity==2)
     suite = get_tests(test_labels, verbosity==2)
     print "Running tests"
     result = unittest.TextTestRunner(verbosity=verbosity).run(suite)
-    destroy_test_db(old_name, verbosity)
+    connection.creation.destroy_test_db(old_name, verbosity)
     teardown_test_environment()
     teardown_pylucid()
@@ -758 +761 @@
 
 print "PyLucid unittest"
+#run_tests(test_labels=["test_plugin_api",])