Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit c58d25cf8d4078ec843a4547a025f830b66b1fbc 1 parent e0d8c5f
Ramiro Morales ramiro authored
Showing with 6 additions and 6 deletions.
  1. +5 −5 django/test/simple.py
  2. +1 −1  docs/topics/testing.txt
10 django/test/simple.py
View
@@ -273,9 +273,9 @@ def setup_databases(self, **kwargs):
# 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 @@ def setup_databases(self, **kwargs):
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 = []
2  docs/topics/testing.txt
View
@@ -493,7 +493,7 @@ can specify the dependencies that exist using the
}
Under this configuration, the ``diamonds`` database will be created first,
-as it is the only database alias without dependencies. The ``default``` and
+as it is the only database alias without dependencies. The ``default`` and
``clubs`` alias will be created next (although the order of creation of this
pair is not guaranteed); then ``hearts``; and finally ``spades``.
Please sign in to comment.
Something went wrong with that request. Please try again.