Ticket #17786: 17786-second-try.patch

django/db/backends/oracle/creation.py

@@ -40 +40 @@
         'URLField':                     'VARCHAR2(%(max_length)s)',
     }
 
-    # This dictionary stores the original values of user and passwd, which are
-    # changed during the tests. It's stored at the class level because the
-    # test database is created and destroyed by different connections (#17786).
-    remember = {}
-
     def __init__(self, connection):
         super(DatabaseCreation, self).__init__(connection)
 
@@ -63 +58 @@
             'tblspace_temp': TEST_TBLSPACE_TMP,
         }
 
-        self.remember['user'] = self.connection.settings_dict['USER']
-        self.remember['passwd'] = self.connection.settings_dict['PASSWORD']
-
         cursor = self.connection.cursor()
         if self._test_database_create():
             try:
@@ -111 +103 @@
                     print "Tests cancelled."
                     sys.exit(1)
 
-        self.connection.settings_dict['TEST_USER'] = self.connection.settings_dict["USER"] = TEST_USER
-        self.connection.settings_dict["PASSWORD"] = TEST_PASSWD
+        self.connection.settings_dict['SAVED_USER'] = self.connection.settings_dict['USER']
+        self.connection.settings_dict['SAVED_PASSWORD'] = self.connection.settings_dict['PASSWORD']
+        self.connection.settings_dict['TEST_USER'] = self.connection.settings_dict['USER'] = TEST_USER
+        self.connection.settings_dict['PASSWORD'] = TEST_PASSWD
 
         return self.connection.settings_dict['NAME']
 
@@ -127 +121 @@
         TEST_TBLSPACE = self._test_database_tblspace()
         TEST_TBLSPACE_TMP = self._test_database_tblspace_tmp()
 
-        self.connection.settings_dict["USER"] = self.remember['user']
-        self.connection.settings_dict["PASSWORD"] = self.remember['passwd']
+        self.connection.settings_dict['USER'] = self.connection.settings_dict['SAVED_USER']
+        self.connection.settings_dict['PASSWORD'] = self.connection.settings_dict['SAVED_PASSWORD']
 
         parameters = {
             'dbname': TEST_NAME,