Merge lp:~lifeless/testtools/344023 into lp:~testtools-committers/testtools/trunk

[Robert Collins]

[Robert Collins (lifeless)]

Cause failing to upcall to setup or teardown to cause a test to error.

[Jonathan Lange (jml)]

Looks good.

review: Approve

=== modified file 'testtools/testcase.py'
--- testtools/testcase.py	2009-10-25 10:19:09 +0000
+++ testtools/testcase.py	2009-10-26 11:30:33 +0000
@@ -29,6 +29,8 @@
         unittest.TestCase.__init__(self, *args, **kwargs)
         self._cleanups = []
         self._last_unique_id = 0
+        self.__setup_called = False
+        self.__teardown_callled = False
 
     def __eq__(self, other):
         eq = getattr(unittest.TestCase, '__eq__', None)
@@ -165,6 +167,8 @@
         try:
             try:
                 self.setUp()
+                if not self.__setup_called:
+                    raise ValueError("setup was not called")
             except KeyboardInterrupt:
                 raise
             except self.skipException, e:
@@ -192,6 +196,8 @@
             cleanupsOk = self._runCleanups(result)
             try:
                 self.tearDown()
+                if not self.__teardown_callled:
+                    raise ValueError("teardown was not called")
             except KeyboardInterrupt:
                 raise
             except:
@@ -202,6 +208,14 @@
         finally:
             result.stopTest(self)
 
+    def setUp(self):
+        unittest.TestCase.setUp(self)
+        self.__setup_called = True
+
+    def tearDown(self):
+        unittest.TestCase.tearDown(self)
+        self.__teardown_callled = True
+
 
 def clone_test_with_new_id(test, new_id):
     """Copy a TestCase, and give the copied test a new id."""

=== modified file 'testtools/tests/test_testresult.py'
--- testtools/tests/test_testresult.py	2009-08-26 22:02:12 +0000
+++ testtools/tests/test_testresult.py	2009-10-26 11:30:33 +0000
@@ -91,6 +91,7 @@
     """Tests for `MultiTestResult`."""
 
     def setUp(self):
+        TestWithFakeExceptions.setUp(self)
         self.result1 = LoggingResult([])
         self.result2 = LoggingResult([])
         self.multiResult = MultiTestResult(self.result1, self.result2)
@@ -167,6 +168,7 @@
     """Tests for `MultiTestResult`."""
 
     def setUp(self):
+        TestWithFakeExceptions.setUp(self)
         self.result_semaphore = threading.Semaphore(1)
         self.target = LoggingResult([])
         self.result1 = ThreadsafeForwardingResult(self.target,

=== modified file 'testtools/tests/test_testtools.py'
--- testtools/tests/test_testtools.py	2009-10-25 10:19:09 +0000
+++ testtools/tests/test_testtools.py	2009-10-26 11:30:33 +0000
@@ -231,6 +231,7 @@
         """A test that logs calls to setUp, runTest and tearDown."""
 
         def setUp(self):
+            TestCase.setUp(self)
             self._calls = ['setUp']
 
         def brokenSetUp(self):
@@ -243,8 +244,10 @@
 
         def tearDown(self):
             self._calls.append('tearDown')
+            TestCase.tearDown(self)
 
     def setUp(self):
+        TestCase.setUp(self)
         self._result_calls = []
         self.test = TestAddCleanup.LoggingTest('runTest')
         self.logging_result = LoggingResult(self._result_calls)
@@ -382,6 +385,29 @@
             "the original test instance should be unchanged.")
 
 
+class TestSetupTearDown(TestCase):
+
+    def test_setUpNotCalled(self):
+        class DoesnotcallsetUp(TestCase):
+            def setUp(self):
+                pass
+            def test_method(self):
+                pass
+        result = unittest.TestResult()
+        DoesnotcallsetUp('test_method').run(result)
+        self.assertEqual(1, len(result.errors))
+
+    def test_tearDownNotCalled(self):
+        class DoesnotcalltearDown(TestCase):
+            def test_method(self):
+                pass
+            def tearDown(self):
+                pass
+        result = unittest.TestResult()
+        DoesnotcalltearDown('test_method').run(result)
+        self.assertEqual(1, len(result.errors))
+
+
 class TestSkipping(TestCase):
     """Tests for skipping of tests functionality."""
 
@@ -391,6 +417,7 @@
     def test_skipException_in_setup_calls_result_addSkip(self):
         class TestThatRaisesInSetUp(TestCase):
             def setUp(self):
+                TestCase.setUp(self)
                 self.skip("skipping this test")
             def test_that_passes(self):
                 pass
@@ -417,6 +444,7 @@
     def test_skip__in_setup_with_old_result_object_calls_addError(self):
         class SkippingTest(TestCase):
             def setUp(self):
+                TestCase.setUp(self)
                 raise self.skipException("skipping this test")
             def test_that_raises_skipException(self):
                 pass