From e7789b186d640ee00e5709fcfbeca43780d379e4 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Mon, 24 Mar 2008 06:18:09 +0000 Subject: Always try to delete the data file before and after the test. This will hopefully avoid spurious failures if the file doesn't have the proper permissions to write for some reason. --- Lib/test/test_gzip.py | 7 ++----- Lib/test/test_io.py | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py index 08f7f3f..0010112 100644 --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -25,13 +25,10 @@ class TestGzip(unittest.TestCase): filename = test_support.TESTFN def setUp (self): - pass + test_support.unlink(self.filename) def tearDown (self): - try: - os.unlink(self.filename) - except os.error: - pass + test_support.unlink(self.filename) def test_write (self): diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 513e1f3..f0e79312 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -79,6 +79,9 @@ class MockNonBlockWriterIO(io.RawIOBase): class IOTest(unittest.TestCase): + def setUp(self): + test_support.unlink(test_support.TESTFN) + def tearDown(self): test_support.unlink(test_support.TESTFN) @@ -619,6 +622,7 @@ class TextIOWrapperTest(unittest.TestCase): def setUp(self): self.testdata = b"AAA\r\nBBB\rCCC\r\nDDD\nEEE\r\n" self.normalized = b"AAA\nBBB\nCCC\nDDD\nEEE\n".decode("ascii") + test_support.unlink(test_support.TESTFN) def tearDown(self): test_support.unlink(test_support.TESTFN) -- cgit v0.12