diff options
| author | Matt Boersma <matt@sprout.org> | 2009-04-21 18:09:03 +0000 |
|---|---|---|
| committer | Matt Boersma <matt@sprout.org> | 2009-04-21 18:09:03 +0000 |
| commit | b09f554175e581da7e60adcb12769b236b97751f (patch) | |
| tree | 6f9fd162b6b5885878f56b2fd6eb3ea63ad5e4b4 | |
| parent | bfe36750b157d744c83a6aaea1bf2cb95afdf65d (diff) | |
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
| -rw-r--r-- | django/db/backends/oracle/creation.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py index a98051a4da..43d8760fca 100644 --- a/django/db/backends/oracle/creation.py +++ b/django/db/backends/oracle/creation.py @@ -56,7 +56,6 @@ class DatabaseCreation(BaseDatabaseCreation): '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 @@ class DatabaseCreation(BaseDatabaseCreation): 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 @@ class DatabaseCreation(BaseDatabaseCreation): 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 @@ class DatabaseCreation(BaseDatabaseCreation): 'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP, } - self.remember['name'] = settings.DATABASE_NAME self.remember['user'] = settings.DATABASE_USER self.remember['passwd'] = settings.DATABASE_PASSWORD |