cpython: aa15df77e58f (original) (raw)

Mercurial > cpython

changeset 82160:aa15df77e58f

Merge: #17064: fix sporadic permission errors in test_mailbox on windows. Patch by Jeremy Kloth. [#17064]

R David Murray rdmurray@bitdance.com
date	Mon, 11 Feb 2013 10:05:34 -0500
parents	a79650aacb43(current diff)3e3915cbfde3(diff)
children	a80b67611c6d
files	Lib/test/test_mailbox.py
diffstat	1 files changed, 8 insertions(+), 8 deletions(-)[+] [-] Lib/test/test_mailbox.py 16

line wrap: on

line diff

--- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -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)[](#l1.7)
```

       support.rmtree(target)[](#l1.8)
   elif os.path.exists(target):[](#l1.9)

```
       os.remove(target)[](#l1.10)
```

```
       support.unlink(target)[](#l1.11)
```

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)[](#l1.19)

       support.rmtree(self._dir)[](#l1.20)
   elif os.path.isfile(self._dir):[](#l1.21)

```
       os.unlink(self._dir)[](#l1.22)
```

       support.unlink(self._dir)[](#l1.23)
   os.mkdir(self._dir)[](#l1.24)
   os.mkdir(os.path.join(self._dir, "cur"))[](#l1.25)
   os.mkdir(os.path.join(self._dir, "tmp"))[](#l1.26)

@@ -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"))[](#l1.31)

   os.rmdir(os.path.join(self._dir, "tmp"))[](#l1.32)

   os.rmdir(os.path.join(self._dir, "new"))[](#l1.33)

```
   os.rmdir(self._dir)[](#l1.34)
```

   support.rmdir(os.path.join(self._dir, "cur"))[](#l1.35)

   support.rmdir(os.path.join(self._dir, "tmp"))[](#l1.36)

   support.rmdir(os.path.join(self._dir, "new"))[](#l1.37)

```
   support.rmdir(self._dir)[](#l1.38)
```

def createMessage(self, dir, mbox=False): t = int(time.time() % 1000000)