9
9
import io
10
10
import tempfile
11
11
from test import support
12
+ from test .support import os_helper
12
13
import unittest
13
14
import textwrap
14
15
import mailbox
@@ -38,9 +39,9 @@ def _check_sample(self, msg):
38
39
def _delete_recursively (self , target ):
39
40
# Delete a file or delete a directory recursively
40
41
if os .path .isdir (target ):
41
- support .rmtree (target )
42
+ os_helper .rmtree (target )
42
43
elif os .path .exists (target ):
43
- support .unlink (target )
44
+ os_helper .unlink (target )
44
45
45
46
46
47
class TestMailbox (TestBase ):
@@ -51,7 +52,7 @@ class TestMailbox(TestBase):
51
52
_template = 'From: foo\n \n %s\n '
52
53
53
54
def setUp (self ):
54
- self ._path = support .TESTFN
55
+ self ._path = os_helper .TESTFN
55
56
self ._delete_recursively (self ._path )
56
57
self ._box = self ._factory (self ._path )
57
58
@@ -926,7 +927,7 @@ def refreshed():
926
927
# the mtime and should cause a re-read. Note that "sleep
927
928
# emulation" is still in effect, as skewfactor is -3.
928
929
filename = os .path .join (self ._path , 'cur' , 'stray-file' )
929
- support .create_empty_file (filename )
930
+ os_helper .create_empty_file (filename )
930
931
os .unlink (filename )
931
932
self ._box ._refresh ()
932
933
self .assertTrue (refreshed ())
@@ -980,7 +981,7 @@ def tearDown(self):
980
981
self ._box .close ()
981
982
self ._delete_recursively (self ._path )
982
983
for lock_remnant in glob .glob (glob .escape (self ._path ) + '.*' ):
983
- support .unlink (lock_remnant )
984
+ os_helper .unlink (lock_remnant )
984
985
985
986
def assertMailboxEmpty (self ):
986
987
with open (self ._path ) as f :
@@ -1312,7 +1313,7 @@ def tearDown(self):
1312
1313
self ._box .close ()
1313
1314
self ._delete_recursively (self ._path )
1314
1315
for lock_remnant in glob .glob (glob .escape (self ._path ) + '.*' ):
1315
- support .unlink (lock_remnant )
1316
+ os_helper .unlink (lock_remnant )
1316
1317
1317
1318
def test_labels (self ):
1318
1319
# Get labels from the mailbox
@@ -1369,7 +1370,7 @@ class TestMessage(TestBase, unittest.TestCase):
1369
1370
_factory = mailbox .Message # Overridden by subclasses to reuse tests
1370
1371
1371
1372
def setUp (self ):
1372
- self ._path = support .TESTFN
1373
+ self ._path = os_helper .TESTFN
1373
1374
1374
1375
def tearDown (self ):
1375
1376
self ._delete_recursively (self ._path )
@@ -2019,7 +2020,7 @@ def _test_close(self, proxy):
2019
2020
class TestProxyFile (TestProxyFileBase , unittest .TestCase ):
2020
2021
2021
2022
def setUp (self ):
2022
- self ._path = support .TESTFN
2023
+ self ._path = os_helper .TESTFN
2023
2024
self ._file = open (self ._path , 'wb+' )
2024
2025
2025
2026
def tearDown (self ):
@@ -2068,7 +2069,7 @@ def test_close(self):
2068
2069
class TestPartialFile (TestProxyFileBase , unittest .TestCase ):
2069
2070
2070
2071
def setUp (self ):
2071
- self ._path = support .TESTFN
2072
+ self ._path = os_helper .TESTFN
2072
2073
self ._file = open (self ._path , 'wb+' )
2073
2074
2074
2075
def tearDown (self ):
@@ -2131,11 +2132,11 @@ class MaildirTestCase(unittest.TestCase):
2131
2132
2132
2133
def setUp (self ):
2133
2134
# create a new maildir mailbox to work with:
2134
- self ._dir = support .TESTFN
2135
+ self ._dir = os_helper .TESTFN
2135
2136
if os .path .isdir (self ._dir ):
2136
- support .rmtree (self ._dir )
2137
+ os_helper .rmtree (self ._dir )
2137
2138
elif os .path .isfile (self ._dir ):
2138
- support .unlink (self ._dir )
2139
+ os_helper .unlink (self ._dir )
2139
2140
os .mkdir (self ._dir )
2140
2141
os .mkdir (os .path .join (self ._dir , "cur" ))
2141
2142
os .mkdir (os .path .join (self ._dir , "tmp" ))
@@ -2145,10 +2146,10 @@ def setUp(self):
2145
2146
2146
2147
def tearDown (self ):
2147
2148
list (map (os .unlink , self ._msgfiles ))
2148
- support .rmdir (os .path .join (self ._dir , "cur" ))
2149
- support .rmdir (os .path .join (self ._dir , "tmp" ))
2150
- support .rmdir (os .path .join (self ._dir , "new" ))
2151
- support .rmdir (self ._dir )
2149
+ os_helper .rmdir (os .path .join (self ._dir , "cur" ))
2150
+ os_helper .rmdir (os .path .join (self ._dir , "tmp" ))
2151
+ os_helper .rmdir (os .path .join (self ._dir , "new" ))
2152
+ os_helper .rmdir (self ._dir )
2152
2153
2153
2154
def createMessage (self , dir , mbox = False ):
2154
2155
t = int (time .time () % 1000000 )
@@ -2174,23 +2175,23 @@ def test_empty_maildir(self):
2174
2175
"""Test an empty maildir mailbox"""
2175
2176
# Test for regression on bug #117490:
2176
2177
# Make sure the boxes attribute actually gets set.
2177
- self .mbox = mailbox .Maildir (support .TESTFN )
2178
+ self .mbox = mailbox .Maildir (os_helper .TESTFN )
2178
2179
#self.assertTrue(hasattr(self.mbox, "boxes"))
2179
2180
#self.assertEqual(len(self.mbox.boxes), 0)
2180
2181
self .assertIsNone (self .mbox .next ())
2181
2182
self .assertIsNone (self .mbox .next ())
2182
2183
2183
2184
def test_nonempty_maildir_cur (self ):
2184
2185
self .createMessage ("cur" )
2185
- self .mbox = mailbox .Maildir (support .TESTFN )
2186
+ self .mbox = mailbox .Maildir (os_helper .TESTFN )
2186
2187
#self.assertEqual(len(self.mbox.boxes), 1)
2187
2188
self .assertIsNotNone (self .mbox .next ())
2188
2189
self .assertIsNone (self .mbox .next ())
2189
2190
self .assertIsNone (self .mbox .next ())
2190
2191
2191
2192
def test_nonempty_maildir_new (self ):
2192
2193
self .createMessage ("new" )
2193
- self .mbox = mailbox .Maildir (support .TESTFN )
2194
+ self .mbox = mailbox .Maildir (os_helper .TESTFN )
2194
2195
#self.assertEqual(len(self.mbox.boxes), 1)
2195
2196
self .assertIsNotNone (self .mbox .next ())
2196
2197
self .assertIsNone (self .mbox .next ())
@@ -2199,7 +2200,7 @@ def test_nonempty_maildir_new(self):
2199
2200
def test_nonempty_maildir_both (self ):
2200
2201
self .createMessage ("cur" )
2201
2202
self .createMessage ("new" )
2202
- self .mbox = mailbox .Maildir (support .TESTFN )
2203
+ self .mbox = mailbox .Maildir (os_helper .TESTFN )
2203
2204
#self.assertEqual(len(self.mbox.boxes), 2)
2204
2205
self .assertIsNotNone (self .mbox .next ())
2205
2206
self .assertIsNotNone (self .mbox .next ())
0 commit comments