#15872: Fix shutil.rmtree error tests for Windows

This commit is contained in:
Hynek Schlawack 2012-12-10 10:10:40 +01:00
commit 8e5a8296cc
1 changed files with 5 additions and 1 deletions

View File

@ -172,7 +172,11 @@ class TestShutil(unittest.TestCase):
filename = os.path.join(tmpdir, "tstfile") filename = os.path.join(tmpdir, "tstfile")
with self.assertRaises(NotADirectoryError) as cm: with self.assertRaises(NotADirectoryError) as cm:
shutil.rmtree(filename) shutil.rmtree(filename)
self.assertEqual(cm.exception.filename, filename) if os.name == 'nt':
rm_name = os.path.join(filename, '*.*')
else:
rm_name = filename
self.assertEqual(cm.exception.filename, rm_name)
self.assertTrue(os.path.exists(filename)) self.assertTrue(os.path.exists(filename))
# test that ignore_errors option is honored # test that ignore_errors option is honored
shutil.rmtree(filename, ignore_errors=True) shutil.rmtree(filename, ignore_errors=True)