Kaydet (Commit) 4ad703b7 authored tarafından Bernhard M. Wiedemann's avatar Bernhard M. Wiedemann Kaydeden (comit) Serhiy Storchaka

bpo-30693: Fix tarfile test cleanup on MSWindows (#5557)

it was using our mocked listdir to check when the files were gone.
üst c1e46e94
...@@ -1131,17 +1131,17 @@ class WriteTest(WriteTestBase, unittest.TestCase): ...@@ -1131,17 +1131,17 @@ class WriteTest(WriteTestBase, unittest.TestCase):
# mock the following: # mock the following:
# os.listdir: so we know that files are in the wrong order # os.listdir: so we know that files are in the wrong order
@unittest.mock.patch('os.listdir') def test_ordered_recursion(self):
def test_ordered_recursion(self, mock_listdir):
path = os.path.join(TEMPDIR, "directory") path = os.path.join(TEMPDIR, "directory")
os.mkdir(path) os.mkdir(path)
open(os.path.join(path, "1"), "a").close() open(os.path.join(path, "1"), "a").close()
open(os.path.join(path, "2"), "a").close() open(os.path.join(path, "2"), "a").close()
mock_listdir.return_value = ["2", "1"]
try: try:
tar = tarfile.open(tmpname, self.mode) tar = tarfile.open(tmpname, self.mode)
try: try:
tar.add(path) with unittest.mock.patch('os.listdir') as mock_listdir:
mock_listdir.return_value = ["2", "1"]
tar.add(path)
paths = [] paths = []
for m in tar.getmembers(): for m in tar.getmembers():
paths.append(os.path.split(m.name)[-1]) paths.append(os.path.split(m.name)[-1])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment