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

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Sep  4 19:33:06 2010
New Revision: 84493

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

........
  r84492 | antoine.pitrou | 2010-09-04 19:32:06 +0200 (sam., 04 sept. 2010) | 4 lines
  
  Issue #9581: Fix non-working PosixGroupsTester test case
  (it only runs as root, which is why nobody bothered about the failure)
........


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

Modified: python/branches/release31-maint/Lib/test/test_posix.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_posix.py	(original)
+++ python/branches/release31-maint/Lib/test/test_posix.py	Sat Sep  4 19:33:06 2010
@@ -310,13 +310,7 @@
     def test_initgroups(self):
         # find missing group
 
-        groups = sorted(self.saved_groups)
-        for g1,g2 in zip(groups[:-1], groups[1:]):
-            g = g1 + 1
-            if g < g2:
-                break
-        else:
-            g = g2 + 1
+        g = max(self.saved_groups) + 1
         name = pwd.getpwuid(posix.getuid()).pw_name
         posix.initgroups(name, g)
         self.assertIn(g, posix.getgroups())
@@ -324,7 +318,7 @@
     @unittest.skipUnless(hasattr(posix, 'setgroups'),
                          "test needs posix.setgroups()")
     def test_setgroups(self):
-        for groups in [[0], range(16)]:
+        for groups in [[0], list(range(16))]:
             posix.setgroups(groups)
             self.assertListEqual(groups, posix.getgroups())