Merge lp:~james-w/django-factory/fix-python2.6-compatibility into lp:django-factory

[James Westby]

Hi,

I hate this fix, so other ideas are welcome.

Thanks,

James

[lp:~james-w/django-factory/fix-python2.6-compatibility]

61. By James Westby on 2012-02-09

Improvements from review. Thanks to jml and achuni.

=== modified file 'README'
--- README	2012-02-07 23:08:29 +0000
+++ README	2012-02-09 18:35:20 +0000
@@ -352,7 +352,9 @@
 0.9
 ```
 
-
+  * Fix `TestCase` compatibility with 2.6. Previously when running under 2.6
+    `testtools.TestCase.__init__` wouldn't be called, leading to lots
+    of problems.
 
 0.8
 ```

=== modified file 'django_factory/testcase.py'
--- django_factory/testcase.py	2011-12-16 21:30:48 +0000
+++ django_factory/testcase.py	2012-02-09 18:35:20 +0000
@@ -26,14 +26,19 @@
     ]
 
 
-class TestCase(DjangoTestCase, TesttoolsTestCase):
+# N.B. The order of the superclasses matters here.
+#  if Django is first then when running under 2.6
+#  TesttoolsTestCase.__init__() won't be called,
+#  causing all sorts of havoc.
+
+class TestCase(TesttoolsTestCase, DjangoTestCase):
 
     def setUp(self):
         super(TestCase, self).setUp()
         self.factory = Factory(test_case=self)
 
 
-class TransactionTestCase(DjangoTransactionTestCase, TesttoolsTestCase):
+class TransactionTestCase(TesttoolsTestCase, DjangoTransactionTestCase):
 
     def setUp(self):
         super(TransactionTestCase, self).setUp()

=== modified file 'django_project/factory_tests/tests.py'
--- django_project/factory_tests/tests.py	2012-02-07 22:58:29 +0000
+++ django_project/factory_tests/tests.py	2012-02-09 18:35:20 +0000
@@ -21,7 +21,10 @@
 from django.db.models import fields as django_fields
 from django.test import TestCase as DjangoTestCase
 
-from testtools import TestCase
+from testtools import (
+    ExtendedToOriginalDecorator,
+    TestCase,
+    )
 from testtools.matchers import StartsWith
 
 from django_factory import generators, testcase
@@ -569,7 +572,7 @@
         self.assertRaises(TypeError, factory.generate_value, field)
 
 
-class TestFactory(DjangoTestCase, TestCase):
+class TestFactory(TestCase, DjangoTestCase):
 
     def test_get_fields_with_no_fields(self):
         fields = Factory.get_fields(test_models.ModelWithNoFields)
@@ -1052,7 +1055,7 @@
 
     def run_test(self, cls, method_name):
         test = cls(method_name)
-        result = TestResult()
+        result = ExtendedToOriginalDecorator(TestResult())
         result.startTestRun()
         test.run(result)
         result.stopTestRun()
@@ -1071,3 +1074,17 @@
                 self.assertIsInstance(self.factory, Factory)
         result = self.run_test(Test, 'test_foo')
         self.assert_(result.wasSuccessful(), result.errors or result.failures)
+
+    def test_test_case_get_unique_integer(self):
+        class Test(testcase.TestCase):
+            def test_foo(self):
+                self.getUniqueInteger()
+        result = self.run_test(Test, 'test_foo')
+        self.assert_(result.wasSuccessful(), result.errors or result.failures)
+
+    def test_transaction_test_case_get_unique_integer(self):
+        class Test(testcase.TransactionTestCase):
+            def test_foo(self):
+                self.getUniqueInteger()
+        result = self.run_test(Test, 'test_foo')
+        self.assert_(result.wasSuccessful(), result.errors or result.failures)