traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid depending on directory iteration order in test_shutil

This commit is contained in:
Antoine Pitrou 2012-06-23 22:05:11 +02:00
parent f3a166d799
commit 4f6e3f74fc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_shutil.py
View File

@ -158,14 +158,13 @@ class TestShutil(unittest.TestCase):
# be either.
if support.verbose:
print("onerror [%d]: %r" % (self.errorState, (func, arg, exc[1])))
if 0 <= self.errorState < 2:
if self.errorState < 2:
if func is os.unlink:
self.assertIn(arg, [self.child_file_path, self.child_dir_path])
self.assertEqual(arg, self.child_file_path)
elif func is os.rmdir:
self.assertEqual(arg, self.child_dir_path)
else:
if self.errorState == 1:
self.assertEqual(func, os.rmdir)
else:
self.assertIs(func, os.listdir, "func must be os.listdir")
self.assertIs(func, os.listdir)
self.assertIn(arg, [TESTFN, self.child_dir_path])
self.assertTrue(issubclass(exc[0], OSError))
self.errorState += 1