diff options
| author | Hynek Schlawack <hs@ox.cx> | 2012-12-10 10:12:57 (GMT) |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2012-12-10 10:12:57 (GMT) |
| commit | 8ade268c6b38407778fc89ab442435cdc715d300 (patch) | |
| tree | b92add7240a87dece85bec05679a5a16334e8b39 /Lib/test/test_shutil.py | |
| parent | 5962cce05065c7d98a42f50b07c0d58c1c61790f (diff) | |
| parent | 9d5e0cca85f22e4d1b7357c32103e63c6396f481 (diff) | |
| download | cpython-8ade268c6b38407778fc89ab442435cdc715d300.zip cpython-8ade268c6b38407778fc89ab442435cdc715d300.tar.gz cpython-8ade268c6b38407778fc89ab442435cdc715d300.tar.bz2 | |
#15872: More shutil test fixes for Windows
This one is different from 3.2 and 3.3. Windows ceased using *.* since 3.4
apparently.
Diffstat (limited to 'Lib/test/test_shutil.py')
| -rw-r--r-- | Lib/test/test_shutil.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 2044340..ad66631 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -172,11 +172,7 @@ class TestShutil(unittest.TestCase): filename = os.path.join(tmpdir, "tstfile") with self.assertRaises(NotADirectoryError) as cm: shutil.rmtree(filename) - if os.name == 'nt': - rm_name = os.path.join(filename, '*.*') - else: - rm_name = filename - self.assertEqual(cm.exception.filename, rm_name) + self.assertEqual(cm.exception.filename, filename) self.assertTrue(os.path.exists(filename)) # test that ignore_errors option is honored shutil.rmtree(filename, ignore_errors=True) |