test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Ramiro Morales 2010-12-09 00:26:59 +00:00
parent e0d8c5fca2
commit c58d25cf8d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/test/simple.py
View File

@ -273,9 +273,9 @@ class DjangoTestSuiteRunner(object):
# the alias. # the alias.
mirrored_aliases[alias] = connection.settings_dict['TEST_MIRROR'] mirrored_aliases[alias] = connection.settings_dict['TEST_MIRROR']
else: else:
# Store the (engine, name) pair. If we have two aliases # Store a tuple with DB parameters that uniquely identify it.
# with the same pair, we only need to create the test database # If we have two aliases with the same values for that tuple,
# once. # we only need to create the test database once.
test_databases.setdefault(( test_databases.setdefault((
connection.settings_dict['HOST'], connection.settings_dict['HOST'],
connection.settings_dict['PORT'], connection.settings_dict['PORT'],
@ -286,8 +286,8 @@ class DjangoTestSuiteRunner(object):
if 'TEST_DEPENDENCIES' in connection.settings_dict: if 'TEST_DEPENDENCIES' in connection.settings_dict:
dependencies[alias] = connection.settings_dict['TEST_DEPENDENCIES'] dependencies[alias] = connection.settings_dict['TEST_DEPENDENCIES']
else: else:
if alias != 'default': if alias != DEFAULT_DB_ALIAS:
dependencies[alias] = connection.settings_dict.get('TEST_DEPENDENCIES', ['default']) dependencies[alias] = connection.settings_dict.get('TEST_DEPENDENCIES', [DEFAULT_DB_ALIAS])
# Second pass -- actually create the databases. # Second pass -- actually create the databases.
old_names = [] old_names = []

2
docs/topics/testing.txt
View File

@ -493,7 +493,7 @@ can specify the dependencies that exist using the
} }
Under this configuration, the ``diamonds`` database will be created first, 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 ``clubs`` alias will be created next (although the order of creation of this
pair is not guaranteed); then ``hearts``; and finally ``spades``. pair is not guaranteed); then ``hearts``; and finally ``spades``.