From 90a3c34b358b58367ed5d2354ba42de9e49daacc Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Wed, 11 Mar 2009 21:14:18 +0000 Subject: [PATCH] Fixed some breakages in the Oracle test database handling from r10026. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10032 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/oracle/creation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py index bff7e1bea5..6dd596e955 100644 --- a/django/db/backends/oracle/creation.py +++ b/django/db/backends/oracle/creation.py @@ -108,8 +108,8 @@ class DatabaseCreation(BaseDatabaseCreation): print "Tests cancelled." sys.exit(1) - settings.DATABASE_USER = TEST_DATABASE_USER - settings.DATABASE_PASSWORD = TEST_DATABASE_PASSWD + 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 @@ -124,8 +124,8 @@ class DatabaseCreation(BaseDatabaseCreation): TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings) TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings) - settings.DATABASE_USER = self.remember['user'] - settings.DATABASE_PASSWORD = self.remember['passwd'] + settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user'] + settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd'] parameters = { 'dbname': TEST_DATABASE_NAME,