commit e7789b186d640ee00e5709fcfbeca43780d379e4
author Neal Norwitz <nnorwitz@gmail.com> Mon Mar 24 06:18:09 2008 +0000
committer Neal Norwitz <nnorwitz@gmail.com> Mon Mar 24 06:18:09 2008 +0000
tree e11a757bac8516d8c17b5aa3882f7048f9916b93
parent 2595e7606c62486405f69c04ef21e6af8bbd9a04

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

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 @@
     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):

Lib/test/test_io.py

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 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 @@
     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)