diff options
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | lib/testresources/tests/test_resourced_test_case.py | 18 |
2 files changed, 7 insertions, 14 deletions
@@ -11,6 +11,9 @@ IMPROVEMENTS * Added ``testresources.FixtureResource`` to wrap ``fixtures.Fixture`` instances. (Robert Collins) +* super() is now called from ResourcedTestCase fixing a long standing issue + with using it as a mix-in in Python 2.4 and above. (Tim Cole, #771505) + 0.2.4 ----- diff --git a/lib/testresources/tests/test_resourced_test_case.py b/lib/testresources/tests/test_resourced_test_case.py index 8c0f44a..7d2cfba 100644 --- a/lib/testresources/tests/test_resourced_test_case.py +++ b/lib/testresources/tests/test_resourced_test_case.py @@ -53,42 +53,32 @@ class TestResourcedTestCase(testtools.TestCase): self.resource = self.getUniqueString() self.resource_manager = MockResource(self.resource) - def testSetUpSuper(self): - """Test that ResourcedTestCase.setUp uses super().""" - + def testSetUpUsesSuper(self): class OtherBaseCase(unittest.TestCase): setUpCalled = False def setUp(self): self.setUpCalled = True super(OtherBaseCase, self).setUp() - class OurCase(testresources.ResourcedTestCase, OtherBaseCase): def runTest(self): pass - ourCase = OurCase() ourCase.setUp() - self.assert_(ourCase.setUpCalled, - "OtherBaseCase.setUp should be called") - - def testTearDownSuper(self): - """Test that ResourcedTestCase.tearDown uses super().""" + self.assertTrue(ourCase.setUpCalled) + def testTearDownUsesSuper(self): class OtherBaseCase(unittest.TestCase): tearDownCalled = False def tearDown(self): self.tearDownCalled = True super(OtherBaseCase, self).setUp() - class OurCase(testresources.ResourcedTestCase, OtherBaseCase): def runTest(self): pass - ourCase = OurCase() ourCase.setUp() ourCase.tearDown() - self.assert_(ourCase.tearDownCalled, - "OtherBaseCase.tearDown should be called") + self.assertTrue(ourCase.tearDownCalled) def testDefaults(self): self.assertEqual(self.resourced_case.resources, []) |