Fixed the testrunner database switcher

martinrusev · Aug 1, 2011 · a53248b · a53248b
1 parent ea3ee64
commit a53248b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/README.rst b/README.rst
@@ -27,13 +27,14 @@ download the tarball and run ``python setup.py install``
 
 
 
-3. Add your test database details in settings.py 
+3. Add your test database details in settings.py. 
 
 ::
 
 	DATABASES = {
 		'default':{
-			'ENGINE':''},
+			'ENGINE':'',
+        },
 		'test':{
 			'ENGINE': '',
 			'NAME': 'test_database',
@@ -116,3 +117,4 @@ Django 1.2+
 
 nose
 
+
diff --git a/quick_test/testrunner.py b/quick_test/testrunner.py
@@ -3,9 +3,10 @@
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.test.simple import DjangoTestSuiteRunner
-from django.db import connection
 import nose.core
 from plugin import ResultPlugin
+from django.db.backends import creation
+from django.db import connection, DatabaseError
 
 try:
 	any
@@ -49,12 +50,21 @@ def run_tests(self, test_labels, extra_tests=None):
 		settings.DEBUG = False
 
 		self.setup_test_environment()
-
+
+
+		# Switch to the test database
+		old_name = settings.DATABASES['default']['NAME']
+
+		if settings.DATABASES['test']['NAME']:
+			settings.DATABASES['default']['NAME'] = settings.DATABASES['test']['NAME']
+		else:
+			settings.DATABASES['default']['NAME'] = creation.TEST_DATABASE_PREFIX + settings.DATABASES['default']['NAME']
+
+		connection.settings_dict["DATABASE_NAME"] = settings.DATABASES['default']['NAME']
+
 		try:
-			settings.DATABASES['default']['SUPPORTS_TRANSACTIONS'] = connection.creation._rollback_works()
+			settings.DATABASES['default']['SUPPORTS_TRANSACTIONS'] = connection.creation._rollback_works()	
-			settings.DATABASES['test']['SUPPORTS_TRANSACTIONS'] = connection.creation._rollback_works()
+		except: 
-		except:
-			# the database engine doesn't support transactions
 			pass
 
 		nose_argv = ['nosetests', '--verbosity', str(self.verbosity)]
@@ -78,6 +88,10 @@ def run_tests(self, test_labels, extra_tests=None):
 
 		result = self.run_suite(nose_argv)
 
+		#Restore the old db name.
+		settings.DATABASES['default']['NAME'] = old_name
+		connection.settings_dict["DATABASE_NAME"] = old_name
+
 		self.teardown_test_environment()
 		# suite_result expects the suite as the first argument.  Fake it.
 		return self.suite_result({}, result)

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 def read(filename):
     return open(os.path.join(os.path.dirname(__file__), filename)).read()
 
-version = '0.3.0'
+version = '0.3.1'
 
 setup(
     name='django_quick_test',