From 8bc59fae569dc0fec9bac719e23e7d5431f756c0 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 12 Jan 2011 18:56:09 +0000 Subject: [PATCH] Merged revisions 87958 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87958 | antoine.pitrou | 2011-01-12 19:45:27 +0100 (mer., 12 janv. 2011) | 4 lines Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch by Ross Lagerwall. ........ --- Lib/test/test_posix.py | 5 ++++- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index e2ef2cfaf4e..a5db21eefbd 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -370,6 +370,7 @@ class PosixTester(unittest.TestCase): os.chdir(curdir) shutil.rmtree(base_path) + @unittest.skipUnless(hasattr(os, 'getegid'), "test needs os.getegid()") def test_getgroups(self): with os.popen('id -G') as idg: groups = idg.read().strip() @@ -379,9 +380,11 @@ class PosixTester(unittest.TestCase): # 'id -G' and 'os.getgroups()' should return the same # groups, ignoring order and duplicates. + # #10822 - it is implementation defined whether posix.getgroups() + # includes the effective gid so we include it anyway, since id -G does self.assertEqual( set([int(x) for x in groups.split()]), - set(posix.getgroups())) + set(posix.getgroups() + [posix.getegid()])) class PosixGroupsTester(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS index 95e31b944a2..2f17900184c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -146,6 +146,9 @@ Build Tests ----- +- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch + by Ross Lagerwall. + - Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in whole runs and enabled selectively using ``--header`` when running an explicit list of tests. Original patch by Collin Winter.