#15872: More shutil test fixes for Windows

diff --cc Lib/test/test_shutil.py
index f352ef138a70d36549d0abf6a20287f08ddbebb6,1eb5e892e81e38ff1a9a7a2e180fc03d702f39f8..92ab0a4150a3bda415a66dc08abd09c9b12f0dd5
--- 1/Lib/test/test_shutil.py
--- 2/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@@ -187,12 -148,12 +187,12 @@@ class TestShutil(unittest.TestCase)
          self.assertEqual(len(errors), 2)
          self.assertIs(errors[0][0], os.listdir)
          self.assertEqual(errors[0][1], filename)
 -        self.assertIsInstance(errors[0][2][1], OSError)
 +        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], OSError)
 +        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.