Ticket #10868: 10868.2.diff

django/db/backends/creation.py

@@ -5 +5 @@
 
 # The prefix to put on the default database name when creating
 # the test database.
+from django.db.utils import load_backend
+
 TEST_DATABASE_PREFIX = 'test_'
 
 class BaseDatabaseCreation(object):
@@ -320 +322 @@
             if verbosity >= 2:
                 test_db_repr = " ('%s')" % test_database_name
             print "Destroying test database for alias '%s'%s..." % (self.connection.alias, test_db_repr)
-        self.connection.settings_dict['NAME'] = old_database_name
 
-        self._destroy_test_db(test_database_name, verbosity)
+        # Temporarily use a new connection and a copy of the settings dict.
+        # This prevents the production database from being exposed to potential
+        # child threads while (or after) the test database is destroyed. Refs
+        # #10868.
+        settings_dict = self.connection.settings_dict.copy()
+        settings_dict['NAME'] = old_database_name
+        backend = load_backend(settings_dict['ENGINE'])
+        new_conn = backend.DatabaseWrapper(
+                              settings_dict,
+                              alias='__destroy_test_db__',
+                              allow_thread_sharing=False)
+        new_conn.creation._destroy_test_db(test_database_name, verbosity)
 
     def _destroy_test_db(self, test_database_name, verbosity):
         "Internal implementation - remove the test db tables."

django/test/simple.py

@@ -312 +312 @@
         return unittest.TextTestRunner(verbosity=self.verbosity, failfast=self.failfast).run(suite)
 
     def teardown_databases(self, old_config, **kwargs):
-        from django.db import connections
+        """
+        Destroys all the non-mirror databases.
+        """
         old_names, mirrors = old_config
-        # Point all the mirrors back to the originals
-        for alias, old_name in mirrors:
-            connections[alias].settings_dict['NAME'] = old_name
-        # Destroy all the non-mirror databases
         for connection, old_name, destroy in old_names:
             if destroy:
                 connection.creation.destroy_test_db(old_name, self.verbosity)
-            else:
-                connection.settings_dict['NAME'] = old_name
 
     def teardown_test_environment(self, **kwargs):
         unittest.removeHandler()

docs/releases/1.4.txt

@@ -942 +942 @@
 a ``%xx`` sequence, but such URLs are very unlikely to happen in the wild,
 since they would confuse browsers too.
 
+Database connections after running the test suite
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The default test runner used to reset the django.db.connections so that after
+the tests were ran, and test databases dropped, new connections would be made
+to the production database. This exposed the production database to threads
+created in the tests that were for some reason still running.
+
+If your code relied on connections to the production database after the tests
+were ran, you will need to subclass DjangoTestRunner and override its
+teardown_databases() method.
+
 Features deprecated in 1.4
 ==========================