diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2017-01-11 17:37:20 -0500 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2017-01-11 17:37:20 -0500 |
| commit | 6c8a2e48c9d74f561216557ad5b07da2cae7c245 (patch) | |
| tree | 102696dcef21cf4d7b8bc7dcb326bb60ee8bc38d | |
| parent | 66e443e3882a142807da136c849f91d5c102fcaa (diff) | |
| download | python-coveragepy-git-6c8a2e48c9d74f561216557ad5b07da2cae7c245.tar.gz | |
Remove explicit clean-up methods that just set an attribute
| -rw-r--r-- | tests/test_cmdline.py | 8 | ||||
| -rw-r--r-- | tests/test_html.py | 14 |
2 files changed, 5 insertions, 17 deletions
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 116ad7d3..223e1313 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -693,13 +693,9 @@ class CmdMainTest(CoverageTest): def setUp(self): super(CmdMainTest, self).setUp() - self.old_CoverageScript = coverage.cmdline.CoverageScript + old_CoverageScript = coverage.cmdline.CoverageScript coverage.cmdline.CoverageScript = self.CoverageScriptStub - self.addCleanup(self.cleanup_coverage_script) - - def cleanup_coverage_script(self): - """Restore CoverageScript when the test is done.""" - coverage.cmdline.CoverageScript = self.old_CoverageScript + self.addCleanup(setattr, coverage.cmdline, 'CoverageScript', old_CoverageScript) def test_normal(self): ret = coverage.cmdline.main(['hello']) diff --git a/tests/test_html.py b/tests/test_html.py index 06d59460..7c35b595 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -102,11 +102,7 @@ class HtmlDeltaTest(HtmlTestHelpers, CoverageTest): # At least one of our tests monkey-patches the version of coverage.py, # so grab it here to restore it later. self.real_coverage_version = coverage.__version__ - self.addCleanup(self.cleanup_coverage_version) - - def cleanup_coverage_version(self): - """A cleanup.""" - coverage.__version__ = self.real_coverage_version + self.addCleanup(setattr, coverage, "__version__", self.real_coverage_version) def test_html_created(self): # Test basic HTML generation: files should be created. @@ -496,12 +492,8 @@ class HtmlStaticFileTest(CoverageTest): def setUp(self): super(HtmlStaticFileTest, self).setUp() - self.original_path = list(coverage.html.STATIC_PATH) - self.addCleanup(self.cleanup_static_path) - - def cleanup_static_path(self): - """A cleanup.""" - coverage.html.STATIC_PATH = self.original_path + original_path = list(coverage.html.STATIC_PATH) + self.addCleanup(setattr, coverage.html, 'STATIC_PATH', original_path) def test_copying_static_files_from_system(self): # Make a new place for static files. |