From: Hynek Schlawack <hs@ox.cx>
Date: Mon, 10 Dec 2012 10:08:59 +0000 (+0100)
Subject: #15872: More shutil test fixes for Windows
X-Git-Tag: v3.3.1rc1~543
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d5e0cca85f22e4d1b7357c32103e63c6396f481;p=thirdparty%2FPython%2Fcpython.git

#15872: More shutil test fixes for Windows
---

9d5e0cca85f22e4d1b7357c32103e63c6396f481
diff --cc Lib/test/test_shutil.py
index f352ef138a70,1eb5e892e81e..92ab0a4150a3
--- a/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.