diff options
author | R David Murray <rdmurray@bitdance.com> | 2013-02-11 15:04:26 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2013-02-11 15:04:26 (GMT) |
commit | b3e8384cbef09c59f593b518f689462add481679 (patch) | |
tree | 34b13f0a97858aa7712c63d271e7b7c408430c82 /Lib | |
parent | f78f5b11f65ff6fd582d937615e8a1c3c8373662 (diff) | |
download | cpython-b3e8384cbef09c59f593b518f689462add481679.zip cpython-b3e8384cbef09c59f593b518f689462add481679.tar.gz cpython-b3e8384cbef09c59f593b518f689462add481679.tar.bz2 |
#17064: fix sporadic permission errors in test_mailbox on windows.
Patch by Jeremy Kloth.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_mailbox.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index c72eb1c..7a84292 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -39,9 +39,9 @@ class TestBase: def _delete_recursively(self, target): # Delete a file or delete a directory recursively if os.path.isdir(target): - shutil.rmtree(target) + support.rmtree(target) elif os.path.exists(target): - os.remove(target) + support.unlink(target) class TestMailbox(TestBase): @@ -2096,9 +2096,9 @@ class MaildirTestCase(unittest.TestCase): # create a new maildir mailbox to work with: self._dir = support.TESTFN if os.path.isdir(self._dir): - shutil.rmtree(self._dir) + support.rmtree(self._dir) elif os.path.isfile(self._dir): - os.unlink(self._dir) + support.unlink(self._dir) os.mkdir(self._dir) os.mkdir(os.path.join(self._dir, "cur")) os.mkdir(os.path.join(self._dir, "tmp")) @@ -2108,10 +2108,10 @@ class MaildirTestCase(unittest.TestCase): def tearDown(self): list(map(os.unlink, self._msgfiles)) - os.rmdir(os.path.join(self._dir, "cur")) - os.rmdir(os.path.join(self._dir, "tmp")) - os.rmdir(os.path.join(self._dir, "new")) - os.rmdir(self._dir) + support.rmdir(os.path.join(self._dir, "cur")) + support.rmdir(os.path.join(self._dir, "tmp")) + support.rmdir(os.path.join(self._dir, "new")) + support.rmdir(self._dir) def createMessage(self, dir, mbox=False): t = int(time.time() % 1000000) |