Skip to content

Commit f453387

Browse files
authored
Make test__fileio parallel-safe (#1038)
1 parent fd11855 commit f453387

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

Tests/modules/io_related/test__fileio.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313

1414
from _io import FileIO
1515

16-
from iptest import run_test
17-
18-
TEMP_READINTO_NAME = "_fileio__FileIO_readinto%d.tmp"
16+
from iptest import IronPythonTestCase, run_test
1917

2018
def bytesio_helper():
2119
return (bytes(bytearray(b'')),
@@ -30,18 +28,18 @@ def bytesio_helper():
3028
bytes(bytearray(b'abcdefghi'))
3129
)
3230

33-
def fileio_helper():
31+
def fileio_helper(temp_readinto_name_template):
3432
bytes_io_list = bytesio_helper()
3533
file_io_list = []
3634
for i in range(len(bytes_io_list)):
37-
with FileIO(TEMP_READINTO_NAME % i, "w") as f:
35+
with FileIO(temp_readinto_name_template % i, "w") as f:
3836
f.write(bytes_io_list[i])
3937

40-
file_io_list.append(FileIO(TEMP_READINTO_NAME % i, "r"))
38+
file_io_list.append(FileIO(temp_readinto_name_template % i, "r"))
4139

4240
return file_io_list
4341

44-
class FileIOTest(unittest.TestCase):
42+
class FileIOTest(IronPythonTestCase):
4543

4644
def test__FileIO___class__(self):
4745
'''
@@ -415,8 +413,9 @@ def test_coverage(self):
415413
]
416414

417415
#Cases working correctly under IronPython
416+
temp_readinto_name_template = os.path.join(self.temporary_dir, "_fileio__FileIO_readinto%d.tmp")
418417
for a_params, a_expected, f_expected in readinto_cases:
419-
f_list = fileio_helper()
418+
f_list = fileio_helper(temp_readinto_name_template)
420419

421420
for i in range(len(f_list)):
422421
a = array.array(*a_params)
@@ -439,7 +438,7 @@ def test_coverage(self):
439438

440439
for i in range(len(f_list)):
441440
try:
442-
os.remove(TEMP_READINTO_NAME % i)
441+
os.remove(temp_readinto_name_template % i)
443442
except:
444443
pass
445444

0 commit comments

Comments
 (0)