From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sat, 24 Jul 2010 14:23:23 +0000 (+0000)
Subject: Merged revisions 83135 via svnmerge from
X-Git-Tag: v2.6.6rc1~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c973454a9ba776d153196c2a4f05d8234ced542;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 83135 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83135 | ronald.oussoren | 2010-07-24 15:21:29 +0100 (Sat, 24 Jul 2010) | 12 lines

  Merged revisions 83133 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83133 | ronald.oussoren | 2010-07-24 15:15:19 +0100 (Sat, 24 Jul 2010) | 5 lines

    Fix for issue 9367: the test code for os.getgroups
    assumes that the result of getgroups and the output
    of the id(1) command return groups in the same
    order.  That assumption is both fragile and false.
  ........
................
---

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 4416f68a451b..4c0d53ac05a8 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -314,7 +314,11 @@ class PosixTester(unittest.TestCase):
         if not groups:
             raise unittest.SkipTest("need working 'id -G'")
 
-        self.assertEqual([int(x) for x in groups.split()], posix.getgroups())
+        # The order of groups isn't important, hence the calls
+        # to sorted.
+        self.assertEqual(
+                list(sorted([int(x) for x in groups.split()])),
+                list(sorted(posix.getgroups())))
 
 class PosixGroupsTester(unittest.TestCase):
     if posix.getuid() == 0 and hasattr(posix, 'getgroups') and sys.platform != 'darwin':