diff options
author | Ned Deily <nad@acm.org> | 2011-10-07 12:01:18 -0700 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-10-07 12:01:18 -0700 |
commit | c4a27451741419c34fc37454d2c6af2c149ea569 (patch) | |
tree | 10058f282d6aebd1965c7db0579cd181f937231d | |
parent | 5472c1c0047b110a4536002b60d93a3c64cd980e (diff) | |
download | cpython-git-c4a27451741419c34fc37454d2c6af2c149ea569.tar.gz |
Issue #7367: Ensure test directory always gets removed.
-rw-r--r-- | Lib/test/test_pkgutil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py index 3b743a8e99..f665e960d4 100644 --- a/Lib/test/test_pkgutil.py +++ b/Lib/test/test_pkgutil.py @@ -15,11 +15,11 @@ class PkgutilTests(unittest.TestCase): def setUp(self): self.dirname = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.dirname) sys.path.insert(0, self.dirname) def tearDown(self): del sys.path[0] - shutil.rmtree(self.dirname) def test_getdata_filesys(self): pkg = 'test_getdata_filesys' @@ -85,9 +85,9 @@ class PkgutilTests(unittest.TestCase): # this does not appear to create an unreadable dir on Windows # but the test should not fail anyway os.mkdir(d, 0) + self.addCleanup(os.rmdir, d) for t in pkgutil.walk_packages(path=[self.dirname]): self.fail("unexpected package found") - os.rmdir(d) class PkgutilPEP302Tests(unittest.TestCase): |