summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2010-12-09 00:26:59 +0000
committerRamiro Morales <cramm0@gmail.com>2010-12-09 00:26:59 +0000
commitc58d25cf8d4078ec843a4547a025f830b66b1fbc (patch)
treece23ffe95be1a3a3ae46a899698bc69a0ecac9ba /django
parente0d8c5fca26bbe20cc26226e794dbb0e61a3467b (diff)
Fixed a couple of typos and small errors from r14696 and r14822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/test/simple.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/django/test/simple.py b/django/test/simple.py
index 3c94ebc64e..1b26ebbe74 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -273,9 +273,9 @@ class DjangoTestSuiteRunner(object):
# the alias.
mirrored_aliases[alias] = connection.settings_dict['TEST_MIRROR']
else:
- # Store the (engine, name) pair. If we have two aliases
- # with the same pair, we only need to create the test database
- # once.
+ # Store a tuple with DB parameters that uniquely identify it.
+ # If we have two aliases with the same values for that tuple,
+ # we only need to create the test database once.
test_databases.setdefault((
connection.settings_dict['HOST'],
connection.settings_dict['PORT'],
@@ -286,8 +286,8 @@ class DjangoTestSuiteRunner(object):
if 'TEST_DEPENDENCIES' in connection.settings_dict:
dependencies[alias] = connection.settings_dict['TEST_DEPENDENCIES']
else:
- if alias != 'default':
- dependencies[alias] = connection.settings_dict.get('TEST_DEPENDENCIES', ['default'])
+ if alias != DEFAULT_DB_ALIAS:
+ dependencies[alias] = connection.settings_dict.get('TEST_DEPENDENCIES', [DEFAULT_DB_ALIAS])
# Second pass -- actually create the databases.
old_names = []