[Python-checkins] cpython (merge 3.2 -> 3.3): #15872: More shutil test fixes for Windows

Mon Dec 10 11:27:17 CET 2012

http://hg.python.org/cpython/rev/a05e2d4094ea
changeset: 80807:a05e2d4094ea
branch: 3.3
parent: 80803:4b2fca8ad07b
parent: 80806:7ce8f4a70ccd
user: Hynek Schlawack <hs at ox.cx>
date: Mon Dec 10 11:08:59 2012 +0100
summary:
 #15872: More shutil test fixes for Windows
files:
 Lib/test/test_shutil.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -188,11 +188,11 @@
 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.
-- 
Repository URL: http://hg.python.org/cpython
