mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
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
This commit is contained in:
parent
e0d8c5fca2
commit
c58d25cf8d
@ -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 = []
|
||||
|
@ -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``.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user