[Python-checkins] r83650 - in python/branches/release26-maint: Lib/test/test_posix.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Aug  3 10:07:18 2010
New Revision: 83650

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

................
  r83643 | ronald.oussoren | 2010-08-03 09:31:12 +0200 (Tue, 03 Aug 2010) | 13 lines
  
  Merged revisions 83431 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r83431 | ronald.oussoren | 2010-08-01 21:18:13 +0200 (Sun, 01 Aug 2010) | 6 lines
    
    
    test_getgroups as introduced with issue7900 failed on systems
    where 'id -G' and posix.getgroups() returned the same information,
    but one of the sources contains duplicate information. Rewrite the
    check using sets instead of lists.
  ........
................


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_posix.py

Modified: python/branches/release26-maint/Lib/test/test_posix.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_posix.py	(original)
+++ python/branches/release26-maint/Lib/test/test_posix.py	Tue Aug  3 10:07:18 2010
@@ -315,11 +315,11 @@
             # This test needs 'id -G'
             return
 
-        # The order of groups isn't important, hence the calls
-        # to sorted.
+        # 'id -G' and 'os.getgroups()' should return the same
+        # groups, ignoring order and duplicates.
         self.assertEqual(
-                list(sorted([int(x) for x in groups.split()])),
-                list(sorted(posix.getgroups())))
+                set([int(x) for x in groups.split()]),
+                set(posix.getgroups()))
 
 class PosixGroupsTester(unittest.TestCase):
     if posix.getuid() == 0 and hasattr(posix, 'getgroups') and sys.platform != 'darwin':