Author: jpellerin
Date: 2006-07-19 11:38:57 -0500 (Wed, 19 Jul 2006)
New Revision: 3381
Modified:
django/branches/multiple-db-support/tests/runtests.py
Log:
[multi-db] Updated runtests.py to load TEST_DATABASE_MODEL settings into
settings.OTHER_DATABASES before test run.
Modified: django/branches/multiple-db-support/tests/runtests.py
===================================================================
--- django/branches/multiple-db-support/tests/runtests.py 2006-07-19
14:58:46 UTC (rev 3380)
+++ django/branches/multiple-db-support/tests/runtests.py 2006-07-19
16:38:57 UTC (rev 3381)
@@ -17,7 +17,7 @@
TEST_DATABASE_NAME + '_a': [ 'multiple_databases.Artist',
'multiple_databases.Opus' ],
TEST_DATABASE_NAME + '_b': [ 'multiple_databases.Widget',
- 'multiple_databases.Doohickey' ]
+ 'multiple_databases.DooHickey' ]
}
error_list = []
@@ -181,13 +181,15 @@
new_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)
if engine == 'sqlite3':
db_st['DATABASE_NAME'] = self._tempfile()
self.cleanup_files.append(db_st['DATABASE_NAME'])
else:
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
settings.OTHER_DATABASES = new_databases
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
