diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2006-07-19 16:38:57 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2006-07-19 16:38:57 +0000 |
| commit | 89ec26a585cd838d03ca7f868bb89a6cc10163f1 (patch) | |
| tree | 035f6111b7f2c08e0e23e29065a993343ed2682d | |
| parent | c5d0e1ac5611458866b9622bc07834c87fb967a6 (diff) | |
[multi-db] Updated runtests.py to load TEST_DATABASE_MODEL settings into
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
| -rwxr-xr-x | tests/runtests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/runtests.py b/tests/runtests.py index 2c3c8080e1..165636cbf4 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -17,7 +17,7 @@ TEST_DATABASE_MODELS = { 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 @@ class TestRunner: 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 |