From: Hynek Schlawack <hs@ox.cx>
Date: Mon, 10 Dec 2012 10:12:57 +0000 (+0100)
Subject: #15872: More shutil test fixes for Windows
X-Git-Tag: v3.4.0a1~1874
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ade268c6b38407778fc89ab442435cdc715d300;p=python

#15872: More shutil test fixes for Windows

This one is different from 3.2 and 3.3.  Windows ceased using *.* since 3.4
apparently.
---

8ade268c6b38407778fc89ab442435cdc715d300
diff --cc Lib/test/test_shutil.py
index 2044340b7f,92ab0a4150..ad666314e6
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@@ -172,11 -171,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)