]> granicus.if.org Git - python/commitdiff
#15872: Fix shutil.rmtree error tests for Windows
authorHynek Schlawack <hs@ox.cx>
Mon, 10 Dec 2012 09:07:11 +0000 (10:07 +0100)
committerHynek Schlawack <hs@ox.cx>
Mon, 10 Dec 2012 09:07:11 +0000 (10:07 +0100)
Lib/test/test_shutil.py

index da4260492273110d772f86f30f18763ff790facf..9dab5f510d41dce6a9c2fad546cf613705efb8fc 100644 (file)
@@ -132,7 +132,11 @@ class TestShutil(unittest.TestCase):
         filename = os.path.join(tmpdir, "tstfile")
         with self.assertRaises(OSError) as cm:
             shutil.rmtree(filename)
-        self.assertEqual(cm.exception.filename, filename)
+        if os.name == 'nt':
+            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 honoured
         shutil.rmtree(filename, ignore_errors=True)