diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-02-02 15:33:37 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-02-02 15:33:37 +0000 |
| commit | 0b8b9fbe306acd1ae310fe292fabec493f329a05 (patch) | |
| tree | a74b16c01928437f376b72d32a2d9c499e90e20f /tests | |
| parent | 837a2e2773125fcda0c419597b2c19a3d05b4879 (diff) | |
[1.2.X] Fixed #15029 -- Moved to database backends the ability to decide if two DATABASES items are different when creating temporary databases for tests.
Backport of [15392] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regressiontests/test_runner/tests.py | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py index 3387d659df..203ed1ebd3 100644 --- a/tests/regressiontests/test_runner/tests.py +++ b/tests/regressiontests/test_runner/tests.py @@ -3,7 +3,6 @@ Tests for django test runner """ import StringIO import unittest -import django from django.core.exceptions import ImproperlyConfigured from django.test import simple @@ -33,9 +32,9 @@ class DependencyOrderingTests(unittest.TestCase): def test_simple_dependencies(self): raw = [ - ('s1', ['alpha']), - ('s2', ['bravo']), - ('s3', ['charlie']), + ('s1', ('s1_db', ['alpha'])), + ('s2', ('s2_db', ['bravo'])), + ('s3', ('s3_db', ['charlie'])), ] dependencies = { 'alpha': ['charlie'], @@ -43,7 +42,7 @@ class DependencyOrderingTests(unittest.TestCase): } ordered = simple.dependency_ordered(raw, dependencies=dependencies) - ordered_sigs = [sig for sig,aliases in ordered] + ordered_sigs = [sig for sig,value in ordered] self.assertTrue('s1' in ordered_sigs) self.assertTrue('s2' in ordered_sigs) @@ -53,9 +52,9 @@ class DependencyOrderingTests(unittest.TestCase): def test_chained_dependencies(self): raw = [ - ('s1', ['alpha']), - ('s2', ['bravo']), - ('s3', ['charlie']), + ('s1', ('s1_db', ['alpha'])), + ('s2', ('s2_db', ['bravo'])), + ('s3', ('s3_db', ['charlie'])), ] dependencies = { 'alpha': ['bravo'], @@ -63,7 +62,7 @@ class DependencyOrderingTests(unittest.TestCase): } ordered = simple.dependency_ordered(raw, dependencies=dependencies) - ordered_sigs = [sig for sig,aliases in ordered] + ordered_sigs = [sig for sig,value in ordered] self.assertTrue('s1' in ordered_sigs) self.assertTrue('s2' in ordered_sigs) @@ -78,10 +77,10 @@ class DependencyOrderingTests(unittest.TestCase): def test_multiple_dependencies(self): raw = [ - ('s1', ['alpha']), - ('s2', ['bravo']), - ('s3', ['charlie']), - ('s4', ['delta']), + ('s1', ('s1_db', ['alpha'])), + ('s2', ('s2_db', ['bravo'])), + ('s3', ('s3_db', ['charlie'])), + ('s4', ('s4_db', ['delta'])), ] dependencies = { 'alpha': ['bravo','delta'], @@ -108,8 +107,8 @@ class DependencyOrderingTests(unittest.TestCase): def test_circular_dependencies(self): raw = [ - ('s1', ['alpha']), - ('s2', ['bravo']), + ('s1', ('s1_db', ['alpha'])), + ('s2', ('s2_db', ['bravo'])), ] dependencies = { 'bravo': ['alpha'], |