mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#15872: More shutil test fixes for Windows

Browse source 
This one is different from 3.2 and 3.3.  Windows ceased using *.* since 3.4
apparently.
This commit is contained in:
Hynek Schlawack 2012-12-10 11:12:57 +01:00
commit 8ade268c6b
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_shutil.py
View file

@ -172,11 +172,7 @@ 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)
if os.name == 'nt': self.assertEqual(cm.exception.filename, filename)
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)