summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-04 17:33:06 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-04 17:33:06 (GMT)
commit5c78edae51aa087ed8f1468769f86f47b62eec6e (patch)
treea7fd4e34038215c121292b348af92bf4c1a09157 /Lib
parent037077fe0362bfddd4a7723674ef39e8dcf1934a (diff)
downloadcpython-5c78edae51aa087ed8f1468769f86f47b62eec6e.zip
cpython-5c78edae51aa087ed8f1468769f86f47b62eec6e.tar.gz
cpython-5c78edae51aa087ed8f1468769f86f47b62eec6e.tar.bz2
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) ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_posix.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 42ad1af..77f47fa 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -310,13 +310,7 @@ class PosixGroupsTester(unittest.TestCase):
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 @@ class PosixGroupsTester(unittest.TestCase):
@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())