]> granicus.if.org Git - python/commitdiff
#15872: More shutil test fixes for Windows
authorHynek Schlawack <hs@ox.cx>
Mon, 10 Dec 2012 10:12:57 +0000 (11:12 +0100)
committerHynek Schlawack <hs@ox.cx>
Mon, 10 Dec 2012 10:12:57 +0000 (11:12 +0100)
This one is different from 3.2 and 3.3.  Windows ceased using *.* since 3.4
apparently.

1  2 
Lib/test/test_shutil.py

index 2044340b7fdd1edb51ecd3f0ef7228bbead103e7,92ab0a4150a3bda415a66dc08abd09c9b12f0dd5..ad666314e6116c1d1178543efcacbe23ba021fb4
@@@ -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)