diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-02-02 14:02:14 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-02-02 14:02:14 +0000 |
| commit | dc5f2607deb35022523fef17dcd8479ca812e887 (patch) | |
| tree | 88c1a08c9b1c0a8d5763f4a8412f3d15d7f47c7c /tests/regressiontests | |
| parent | 77030ccc1ea4e1df04540e4d4594cb0d741fa2b4 (diff) | |
Fixed #15029 -- Moved to database backends the ability to decide if two DATABASES items are different when creating temporary databases for tests.
hG: Enter commit message. Lines beginning with 'HG:' are removed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
| -rw-r--r-- | tests/regressiontests/test_runner/tests.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py index b34c455a31..dfdd57498c 100644 --- a/tests/regressiontests/test_runner/tests.py +++ b/tests/regressiontests/test_runner/tests.py @@ -33,9 +33,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 +43,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.assertIn('s1', ordered_sigs) self.assertIn('s2', ordered_sigs) @@ -53,9 +53,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 +63,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.assertIn('s1', ordered_sigs) self.assertIn('s2', ordered_sigs) @@ -78,10 +78,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 +108,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'], |