From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 20 Mar 2007 06:53:17 +0000 (+0000)
Subject: Try to be a little more resilient to errors.  This might help the test
X-Git-Tag: v2.6a1~1963
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cbd8de64175327c9d7d088b92f74cbd1c32f3e6;p=thirdparty%2FPython%2Fcpython.git

Try to be a little more resilient to errors.  This might help the test
pass, but my guess is that it won't.  I'm guessing that some other
test is leaving this file open which means it can't be removed
under Windows AFAIK.
---

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index fe186fa4ef32..175c291a1208 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -694,7 +694,7 @@ class _TestMboxMMDF(TestMailbox):
         self._box.close()
         self._delete_recursively(self._path)
         for lock_remnant in glob.glob(self._path + '.*'):
-            os.remove(lock_remnant)
+            test_support.unlink(lock_remnant)
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
@@ -915,7 +915,7 @@ class TestBabyl(TestMailbox):
         self._box.close()
         self._delete_recursively(self._path)
         for lock_remnant in glob.glob(self._path + '.*'):
-            os.remove(lock_remnant)
+            test_support.unlink(lock_remnant)
 
     def test_labels(self):
         # Get labels from the mailbox