mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity

[multi-db] Updated runtests.py to load TEST_DATABASE_MODEL settings into

Browse Source 
settings.OTHER_DATABASES before test run.


git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jason Pellerin 2006-07-19 16:38:57 +00:00
parent c5d0e1ac56
commit 89ec26a585
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/runtests.py
View File

@ -17,7 +17,7 @@ TEST_DATABASE_MODELS = {
TEST_DATABASE_NAME + '_a': [ 'multiple_databases.Artist', TEST_DATABASE_NAME + '_a': [ 'multiple_databases.Artist',
'multiple_databases.Opus' ], 'multiple_databases.Opus' ],
TEST_DATABASE_NAME + '_b': [ 'multiple_databases.Widget', TEST_DATABASE_NAME + '_b': [ 'multiple_databases.Widget',
'multiple_databases.Doohickey' ] 'multiple_databases.DooHickey' ]
} }
error_list = [] error_list = []
@ -181,13 +181,15 @@ class TestRunner:
new_databases = {} new_databases = {}
for db_name in TEST_DATABASES: for db_name in TEST_DATABASES:
db_st = settings.OTHER_DATABASES.setdefault(db_name, {}) db_st = settings.OTHER_DATABASES.get(db_name, {})
engine = db_st.get('DATABASE_ENGINE', settings.DATABASE_ENGINE) engine = db_st.get('DATABASE_ENGINE', settings.DATABASE_ENGINE)
if engine == 'sqlite3': if engine == 'sqlite3':
db_st['DATABASE_NAME'] = self._tempfile() db_st['DATABASE_NAME'] = self._tempfile()
self.cleanup_files.append(db_st['DATABASE_NAME']) self.cleanup_files.append(db_st['DATABASE_NAME'])
else: else:
db_st['DATABASE_NAME'] = db_name db_st['DATABASE_NAME'] = db_name
if db_name in TEST_DATABASE_MODELS:
db_st['MODELS'] = TEST_DATABASE_MODELS[db_name]
new_databases[db_name] = db_st new_databases[db_name] = db_st
settings.OTHER_DATABASES = new_databases settings.OTHER_DATABASES = new_databases