Author: kmtracey
Date: 2010-12-18 10:51:18 -0600 (Sat, 18 Dec 2010)
New Revision: 14927
Modified:
django/branches/releases/1.2.X/tests/regressiontests/test_runner/tests.py
Log:
[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.
Modified:
django/branches/releases/1.2.X/tests/regressiontests/test_runner/tests.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/test_runner/tests.py
2010-12-18 15:37:55 UTC (rev 14926)
+++ django/branches/releases/1.2.X/tests/regressiontests/test_runner/tests.py
2010-12-18 16:51:18 UTC (rev 14927)
@@ -45,11 +45,11 @@
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 @@
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 @@
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 = [
--
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.
