diff options
| author | Matt Boersma <matt@sprout.org> | 2009-04-21 18:09:52 +0000 |
|---|---|---|
| committer | Matt Boersma <matt@sprout.org> | 2009-04-21 18:09:52 +0000 |
| commit | 9fabfedcbe4fa8809f08f45cf5f612b8bc1bc67d (patch) | |
| tree | 1bd2418ecbc8ec69ea0047a68aae245a9909e3ed /django | |
| parent | a486c1e9b60f145f6ef867ea64a3c8beb750f5cf (diff) | |
[1.0.X] Fixed #10716 so Oracle tests run again. Thanks very much, kmtracey.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -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 4305ee15c9..d8865d6054 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 = TEST_DATABASE_NAME - settings.DATABASE_USER = TEST_DATABASE_USER + settings.TEST_DATABASE_USER = settings.DATABASE_USER = TEST_DATABASE_USER settings.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.remember['name'] settings.DATABASE_USER = self.remember['user'] settings.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 |