Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#15872: Be flexible with appending *.* in shutil.rmtree test case 

The Windows buildbots seem to be unable to agree whether they need them or not.
This commit is contained in:
Hynek Schlawack 2012-12-10 12:05:45 +01:00
parent 8ade268c6b f29b4937f7
commit 99d28ce0cd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_shutil.py
View File

@ -172,7 +172,11 @@ class TestShutil(unittest.TestCase):
filename = os.path.join(tmpdir, "tstfile")
with self.assertRaises(NotADirectoryError) as cm:
shutil.rmtree(filename)
self.assertEqual(cm.exception.filename, filename)
if cm.exception.filename.endswith('*.*'):
rm_name = os.path.join(filename, '*.*')
else:
rm_name = filename
self.assertEqual(cm.exception.filename, rm_name)
self.assertTrue(os.path.exists(filename))
# test that ignore_errors option is honored
shutil.rmtree(filename, ignore_errors=True)
@ -185,11 +189,11 @@ class TestShutil(unittest.TestCase):
self.assertIs(errors[0][0], os.listdir)
self.assertEqual(errors[0][1], filename)
self.assertIsInstance(errors[0][2][1], NotADirectoryError)
self.assertEqual(errors[0][2][1].filename, filename)
self.assertEqual(errors[0][2][1].filename, rm_name)
self.assertIs(errors[1][0], os.rmdir)
self.assertEqual(errors[1][1], filename)
self.assertIsInstance(errors[1][2][1], NotADirectoryError)
self.assertEqual(errors[1][2][1].filename, filename)
self.assertEqual(errors[1][2][1].filename, rm_name)
# See bug #1071513 for why we don't run this on cygwin
# and bug #1076467 for why we don't run this as root.