Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #10716 -- Fixed a couple of typos in Oracle testing setup.

Thanks, canarix.

Backport of r10547 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cab85015c59028c490f6cfd3e15f5f80e3f1055d 1 parent 1e0c34d
Malcolm Tredinnick malcolmt authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 django/db/backends/oracle/creation.py
8 django/db/backends/oracle/creation.py
View
@@ -56,6 +56,7 @@ 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
@@ -108,6 +109,7 @@ def _create_test_db(self, verbosity=1, autoclobber=False):
print "Tests cancelled."
sys.exit(1)
+ settings.DATABASE_NAME = TEST_DATABASE_NAME
settings.DATABASE_USER = TEST_DATABASE_USER
settings.DATABASE_PASSWORD = TEST_DATABASE_PASSWD
@@ -124,6 +126,7 @@ 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.remember['name']
settings.DATABASE_USER = self.remember['user']
settings.DATABASE_PASSWORD = self.remember['passwd']
@@ -135,6 +138,7 @@ 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
@@ -244,8 +248,8 @@ def _test_user_create(self, settings):
raise
return name
- def _test_database_user(self, ettings):
- name = TEST_DATABASE_PREFIX + settings.DATABASE_NAME
+ def _test_database_user(self, settings):
+ name = TEST_DATABASE_PREFIX + settings.DATABASE_USER
try:
if settings.TEST_DATABASE_USER:
name = settings.TEST_DATABASE_USER
Please sign in to comment.
Something went wrong with that request. Please try again.