Author: ramiro
Date: 2010-12-08 18:26:59 -0600 (Wed, 08 Dec 2010)
New Revision: 14862
Modified:
django/trunk/django/test/simple.py
django/trunk/docs/topics/testing.txt
Log:
Fixed a couple of typos and small errors from r14696 and r14822.
Modified: django/trunk/django/test/simple.py
===================================================================
--- django/trunk/django/test/simple.py 2010-12-08 23:48:28 UTC (rev 14861)
+++ django/trunk/django/test/simple.py 2010-12-09 00:26:59 UTC (rev 14862)
@@ -273,9 +273,9 @@
# 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 @@
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 = []
Modified: django/trunk/docs/topics/testing.txt
===================================================================
--- django/trunk/docs/topics/testing.txt 2010-12-08 23:48:28 UTC (rev
14861)
+++ django/trunk/docs/topics/testing.txt 2010-12-09 00:26:59 UTC (rev
14862)
@@ -493,7 +493,7 @@
}
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``.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
