diff options
author | tim.cole@canonical.com <> | 2011-05-03 11:38:27 -0700 |
---|---|---|
committer | tim.cole@canonical.com <> | 2011-05-03 11:38:27 -0700 |
commit | 7fe5a514f2b99b548af39a555658fd2276dbd44c (patch) | |
tree | 39f7112df75c12afc726a61ba882eb184c50bf0e | |
parent | 035e372020215d1bb76d7aef9f72b755dd1d3771 (diff) | |
download | testresources-7fe5a514f2b99b548af39a555658fd2276dbd44c.tar.gz |
fix usage of super() and get tests passing
-rw-r--r-- | lib/testresources/__init__.py | 4 | ||||
-rw-r--r-- | lib/testresources/tests/test_optimising_test_suite.py | 2 | ||||
-rw-r--r-- | lib/testresources/tests/test_resourced_test_case.py | 38 |
3 files changed, 41 insertions, 3 deletions
diff --git a/lib/testresources/__init__.py b/lib/testresources/__init__.py index 668a3e3..9b12931 100644 --- a/lib/testresources/__init__.py +++ b/lib/testresources/__init__.py @@ -674,7 +674,7 @@ class ResourcedTestCase(unittest.TestCase): resources = [] def setUp(self): - unittest.TestCase.setUp(self) + super(ResourcedTestCase, self).setUp() self.setUpResources() def setUpResources(self): @@ -682,7 +682,7 @@ class ResourcedTestCase(unittest.TestCase): def tearDown(self): self.tearDownResources() - unittest.TestCase.tearDown(self) + super(ResourcedTestCase, self).tearDown() def tearDownResources(self): tearDownResources(self, self.resources, _get_result()) diff --git a/lib/testresources/tests/test_optimising_test_suite.py b/lib/testresources/tests/test_optimising_test_suite.py index 075590c..cf13755 100644 --- a/lib/testresources/tests/test_optimising_test_suite.py +++ b/lib/testresources/tests/test_optimising_test_suite.py @@ -80,7 +80,7 @@ class TestOptimisingTestSuite(testtools.TestCase): return test_case def setUp(self): - super(TestOptimizingTestSuite, self).setUp() + super(TestOptimisingTestSuite, self).setUp() self.optimising_suite = testresources.OptimisingTestSuite() def testAddTest(self): diff --git a/lib/testresources/tests/test_resourced_test_case.py b/lib/testresources/tests/test_resourced_test_case.py index ffa89e8..8c0f44a 100644 --- a/lib/testresources/tests/test_resourced_test_case.py +++ b/lib/testresources/tests/test_resourced_test_case.py @@ -15,6 +15,7 @@ # license. # +import unittest import testtools import testresources from testresources.tests import ResultWithResourceExtensions @@ -52,6 +53,43 @@ class TestResourcedTestCase(testtools.TestCase): self.resource = self.getUniqueString() self.resource_manager = MockResource(self.resource) + def testSetUpSuper(self): + """Test that ResourcedTestCase.setUp uses super().""" + + 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().""" + + 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") + def testDefaults(self): self.assertEqual(self.resourced_case.resources, []) |