#15872: More shutil test fixes for Windows

Lib/test/test_shutil.py

@@ -188,11 +188,11 @@ class TestShutil(unittest.TestCase):
         self.assertIs(errors[0][0], os.listdir)
         self.assertEqual(errors[0][1], filename)
         self.assertIsInstance(errors[0][2][1], NotADirectoryError)
-        self.assertEqual(errors[0][2][1].filename, filename)
+        self.assertEqual(errors[0][2][1].filename, rm_name)
         self.assertIs(errors[1][0], os.rmdir)
         self.assertEqual(errors[1][1], filename)
         self.assertIsInstance(errors[1][2][1], NotADirectoryError)
-        self.assertEqual(errors[1][2][1].filename, filename)
+        self.assertEqual(errors[1][2][1].filename, rm_name)
 
     # See bug #1071513 for why we don't run this on cygwin
     # and bug #1076467 for why we don't run this as root.