Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored December 09, 2010
10  django/test/simple.py
@@ -273,9 +273,9 @@ def setup_databases(self, **kwargs):
273 273
                 # the alias.
274 274
                 mirrored_aliases[alias] = connection.settings_dict['TEST_MIRROR']
275 275
             else:
276  
-                # Store the (engine, name) pair. If we have two aliases
277  
-                # with the same pair, we only need to create the test database
278  
-                # once.
  276
+                # Store a tuple with DB parameters that uniquely identify it.
  277
+                # If we have two aliases with the same values for that tuple,
  278
+                # we only need to create the test database once.
279 279
                 test_databases.setdefault((
280 280
                         connection.settings_dict['HOST'],
281 281
                         connection.settings_dict['PORT'],
@@ -286,8 +286,8 @@ def setup_databases(self, **kwargs):
286 286
                 if 'TEST_DEPENDENCIES' in connection.settings_dict:
287 287
                     dependencies[alias] = connection.settings_dict['TEST_DEPENDENCIES']
288 288
                 else:
289  
-                    if alias != 'default':
290  
-                        dependencies[alias] = connection.settings_dict.get('TEST_DEPENDENCIES', ['default'])
  289
+                    if alias != DEFAULT_DB_ALIAS:
  290
+                        dependencies[alias] = connection.settings_dict.get('TEST_DEPENDENCIES', [DEFAULT_DB_ALIAS])
291 291
 
292 292
         # Second pass -- actually create the databases.
293 293
         old_names = []
2  docs/topics/testing.txt
@@ -493,7 +493,7 @@ can specify the dependencies that exist using the
493 493
     }
494 494
 
495 495
 Under this configuration, the ``diamonds`` database will be created first,
496  
-as it is the only database alias without dependencies. The ``default``` and
  496
+as it is the only database alias without dependencies. The ``default`` and
497 497
 ``clubs`` alias will be created next (although the order of creation of this
498 498
 pair is not guaranteed); then ``hearts``; and finally ``spades``.
499 499
 

0 notes on commit c58d25c

Please sign in to comment.
Something went wrong with that request. Please try again.