[Python-checkins] cpython (merge 3.3 -> default): sort os.listxattr results before comparing it to avoid depending on the

[gregory.p.smith]

http://hg.python.org/cpython/rev/63fc7af91752
changeset:   88528:63fc7af91752
parent:      88526:b62e881129a5
parent:      88527:38333fa7dfe4
user:        Gregory P. Smith <greg at krypto.org>
date:        Fri Jan 17 12:01:40 2014 -0800
summary:
  sort os.listxattr results before comparing it to avoid depending on the         ordering of the directory information in the underlying filesystem.

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
@@ -431,7 +431,7 @@
         os.setxattr(src, 'user.foo', b'42')
         os.setxattr(src, 'user.bar', b'43')
         shutil._copyxattr(src, dst)
-        self.assertEqual(os.listxattr(src), os.listxattr(dst))
+        self.assertEqual(sorted(os.listxattr(src)), sorted(os.listxattr(dst)))
         self.assertEqual(
                 os.getxattr(src, 'user.foo'),
                 os.getxattr(dst, 'user.foo'))

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