Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed test_runner tests on 1.2.X branch to not atempt to use …

…new unittest support that does not exist there.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5e6c5418c0cd7473fabd5d5a1a9f6a07625a8060 1 parent 82e8ad3
@kmtracey kmtracey authored
Showing with 20 additions and 20 deletions.
  1. +20 −20 tests/regressiontests/test_runner/tests.py
View
40 tests/regressiontests/test_runner/tests.py
@@ -45,11 +45,11 @@ def test_simple_dependencies(self):
ordered = simple.dependency_ordered(raw, dependencies=dependencies)
ordered_sigs = [sig for sig,aliases in ordered]
- self.assertIn('s1', ordered_sigs)
- self.assertIn('s2', ordered_sigs)
- self.assertIn('s3', ordered_sigs)
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s1'))
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s2'))
+ self.assertTrue('s1' in ordered_sigs)
+ self.assertTrue('s2' in ordered_sigs)
+ self.assertTrue('s3' in ordered_sigs)
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s1'))
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s2'))
def test_chained_dependencies(self):
raw = [
@@ -65,16 +65,16 @@ def test_chained_dependencies(self):
ordered = simple.dependency_ordered(raw, dependencies=dependencies)
ordered_sigs = [sig for sig,aliases in ordered]
- self.assertIn('s1', ordered_sigs)
- self.assertIn('s2', ordered_sigs)
- self.assertIn('s3', ordered_sigs)
+ self.assertTrue('s1' in ordered_sigs)
+ self.assertTrue('s2' in ordered_sigs)
+ self.assertTrue('s3' in ordered_sigs)
# Explicit dependencies
- self.assertLess(ordered_sigs.index('s2'), ordered_sigs.index('s1'))
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s2'))
+ self.assertTrue(ordered_sigs.index('s2') < ordered_sigs.index('s1'))
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s2'))
# Implied dependencies
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s1'))
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s1'))
def test_multiple_dependencies(self):
raw = [
@@ -92,19 +92,19 @@ def test_multiple_dependencies(self):
ordered = simple.dependency_ordered(raw, dependencies=dependencies)
ordered_sigs = [sig for sig,aliases in ordered]
- self.assertIn('s1', ordered_sigs)
- self.assertIn('s2', ordered_sigs)
- self.assertIn('s3', ordered_sigs)
- self.assertIn('s4', ordered_sigs)
+ self.assertTrue('s1' in ordered_sigs)
+ self.assertTrue('s2' in ordered_sigs)
+ self.assertTrue('s3' in ordered_sigs)
+ self.assertTrue('s4' in ordered_sigs)
# Explicit dependencies
- self.assertLess(ordered_sigs.index('s2'), ordered_sigs.index('s1'))
- self.assertLess(ordered_sigs.index('s4'), ordered_sigs.index('s1'))
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s2'))
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s4'))
+ self.assertTrue(ordered_sigs.index('s2') < ordered_sigs.index('s1'))
+ self.assertTrue(ordered_sigs.index('s4') < ordered_sigs.index('s1'))
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s2'))
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s4'))
# Implicit dependencies
- self.assertLess(ordered_sigs.index('s3'), ordered_sigs.index('s1'))
+ self.assertTrue(ordered_sigs.index('s3') < ordered_sigs.index('s1'))
def test_circular_dependencies(self):
raw = [
Please sign in to comment.
Something went wrong with that request. Please try again.