[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/964cfda9ccc5
changeset:   76893:964cfda9ccc5
parent:      76892:10e8b97d0fd7
parent:      76889:8d85f9920878
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat May 12 23:43:55 2012 +0200
summary:
  Merge

files:
  Lib/test/test_shutil.py |  2 +-
  1 files changed, 1 insertions(+), 1 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
@@ -343,7 +343,7 @@
             orig_setxattr = os.setxattr
             os.setxattr = _raise_on_user_foo
             shutil._copyxattr(src, dst)
-            self.assertEqual(['user.bar'], os.listxattr(dst))
+            self.assertIn('user.bar', os.listxattr(dst))
         finally:
             os.setxattr = orig_setxattr
 

-- 
Repository URL: http://hg.python.org/cpython