altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 6 Packages Projects Releases Wiki Activity

Make test runner multi-DB-aware

Browse source 
- Legacy-Id: 3786
This commit is contained in:
Ole Laursen 2011-12-23 13:15:27 +00:00
parent aaee353493
commit 9ae5f6a456
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ietf/utils/test_runner.py
View file

@ -47,16 +47,16 @@ def safe_create_1(self, verbosity, *args, **kwargs):
global test_database_name, old_create global test_database_name, old_create
print " Creating test database..." print " Creating test database..."
x = old_create(self, 0, *args, **kwargs) x = old_create(self, 0, *args, **kwargs)
print " Saving test database name "+settings.DATABASE_NAME+"..." print " Saving test database name "+settings.DATABASES["default"]["NAME"]+"..."
test_database_name = settings.DATABASE_NAME test_database_name = settings.DATABASES["default"]["NAME"]
return x return x
def safe_destroy_0_1(*args, **kwargs): def safe_destroy_0_1(*args, **kwargs):
global test_database_name, old_destroy global test_database_name, old_destroy
print " Checking that it's safe to destroy test database..." print " Checking that it's safe to destroy test database..."
if settings.DATABASE_NAME != test_database_name: if settings.DATABASES["default"]["NAME"] != test_database_name:
print " NOT SAFE; Changing settings.DATABASE_NAME from "+settings.DATABASE_NAME+" to "+test_database_name print ' NOT SAFE; Changing settings.DATABASES["default"]["NAME"] from %s to %s' % (settings.DATABASES["default"]["NAME"], test_database_name)
settings.DATABASE_NAME = test_database_name settings.DATABASES["default"]["NAME"] = test_database_name
return old_destroy(*args, **kwargs) return old_destroy(*args, **kwargs)
def template_coverage_loader(template_name, dirs): def template_coverage_loader(template_name, dirs):

5
ietf/utils/test_utils.py
View file

@ -44,13 +44,14 @@ from datetime import datetime
import urllib2 as urllib import urllib2 as urllib
from difflib import unified_diff from difflib import unified_diff
real_database_name = ietf.settings.DATABASES["default"]["NAME"]
import traceback import traceback
class RealDatabaseTest: class RealDatabaseTest:
def setUpRealDatabase(self): def setUpRealDatabase(self):
self._original_testdb = self._getDatabaseName() self._original_testdb = self._getDatabaseName()
newdb = ietf.settings.DATABASE_NAME newdb = real_database_name
print " Switching database from "+self._original_testdb+" to "+newdb print " Switching database from "+self._original_testdb+" to "+newdb
self._setDatabaseName(newdb) self._setDatabaseName(newdb)
@ -64,7 +65,7 @@ class RealDatabaseTest:
def _setDatabaseName(self, name): def _setDatabaseName(self, name):
connection.close() connection.close()
django.conf.settings.DATABASE_NAME = name django.conf.settings.DATABASES["default"]["NAME"] = name
connection.settings_dict['NAME'] = name connection.settings_dict['NAME'] = name
connection.cursor() connection.cursor()