Changeset 3263

Timestamp:

07/03/06 15:47:33 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Added TEST_DATABASES tuple to runtests.py. Now, databases in TEST_DATABASES will be created (if they don't exist or if the user accepts) at the start of the test run and dropped at the end. Those databases will be assigned to settings.DATABASES, with settings other than the database name inherited either from the DATABASES property in the active settings file (if it is present and contains a matching key) or from the default database settings.

Files:

• django/branches/multiple-db-support/tests/runtests.py (modified) (3 diffs)

django/branches/multiple-db-support/tests/runtests.py

@@ -12 +12 @@
-REGRESSION_TESTS_DIR_NAME = 'regressiontests'
-TEST_DATABASE_NAME = 'django_test_db'
+TEST_DATABASES = (TEST_DATABASE_NAME + '_a', TEST_DATABASE_NAME + '_b')
-
-error_list = []
@@ -165 +166 @@
-        self.old_databases = settings.DATABASES
-
-        db_a = TEST_DATABASE_NAME + '_a'
-        db_b = TEST_DATABASE_NAME + '_b'
-        if settings.DATABASE_ENGINE == 'sqlite3':
-            # If we're using SQLite, it's more convenient to test against an
@@ -172 +171 @@
-            # after that we have to use temp files. 
-            TEST_DATABASE_NAME = ':memory:'
-    db_a_name = self._tempfile()
-    db_b_name = self._tempfile()
-    self.cleanup_files.append(db_a_name)
-self.cleanup_files.append(db_b_name)           
-else:
-db_a_name = db_a
-db_b_name = db_b
-
-settings.DATABASES = {
-db_a: { 'DATABASE_NAME': db_a_name },
-db_b: { 'DATABASE_NAME': db_b_name }
-    }
+
+new_databases = {}
+for db_name in TEST_DATABASES:
+db_st = settings.DATABASES.setdefault(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
+new_databases[db_name] = db_st
+settings.DATABASES = new_databases
-
-        self.create_test_db(TEST_DATABASE_NAME, connection)