Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #10716 so Oracle tests run again. Thanks very much, kmtracey.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b09f554175e581da7e60adcb12769b236b97751f 1 parent bfe3675
@mboersma mboersma authored
Showing with 1 addition and 5 deletions.
  1. +1 −5 django/db/backends/oracle/creation.py
View
6 django/db/backends/oracle/creation.py
@@ -56,7 +56,6 @@ def _create_test_db(self, verbosity=1, autoclobber=False):
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
}
- self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD
@@ -109,8 +108,7 @@ def _create_test_db(self, verbosity=1, autoclobber=False):
print "Tests cancelled."
sys.exit(1)
- settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = TEST_DATABASE_NAME
- settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
+ settings.TEST_DATABASE_USER = settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = TEST_DATABASE_PASSWD
return settings.DATABASE_NAME
@@ -126,7 +124,6 @@ def _destroy_test_db(self, test_database_name, verbosity=1):
TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings)
TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings)
- settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = self.remember['name']
settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user']
settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd']
@@ -138,7 +135,6 @@ def _destroy_test_db(self, test_database_name, verbosity=1):
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
}
- self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD
Please sign in to comment.
Something went wrong with that request. Please try again.