Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge: #17064: fix sporadic permission errors in test_mailbox on windows. 

Patch by Jeremy Kloth.
This commit is contained in:
R David Murray 2013-02-11 10:05:34 -05:00
parent 890d72d3c9 0b61d3c0f2
commit a6e902ae35
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_mailbox.py
View File

@ -43,9 +43,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):
@ -2112,9 +2112,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"))
@ -2124,10 +2124,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)