[Python-checkins] cpython (2.7): Issue #14698: Make test_posix more robust when the current UID doesn't have an

Wed May 2 20:05:27 CEST 2012

http://hg.python.org/cpython/rev/45f0272f5296
changeset: 76713:45f0272f5296
branch: 2.7
user: Charles-François Natali <neologix at free.fr>
date: Wed May 02 20:00:37 2012 +0200
summary:
 Issue #14698: Make test_posix more robust when the current UID doesn't have an
associated pwd entry.
files:
 Lib/test/test_posix.py | 9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -108,7 +108,11 @@
 # If a non-privileged user invokes it, it should fail with OSError
 # EPERM.
 if os.getuid() != 0:
- name = pwd.getpwuid(posix.getuid()).pw_name
+ try:
+ name = pwd.getpwuid(posix.getuid()).pw_name
+ except KeyError:
+ # the current UID may not have a pwd entry
+ raise unittest.SkipTest("need a pwd entry")
 try:
 posix.initgroups(name, 13)
 except OSError as e:
@@ -418,8 +422,9 @@
 def test_getgroups(self):
 with os.popen('id -G') as idg:
 groups = idg.read().strip()
+ ret = idg.close()
 
- if not groups:
+ if ret != 0 or not groups:
 raise unittest.SkipTest("need working 'id -G'")
 
 # 'id -G' and 'os.getgroups()' should return the same
-- 
Repository URL: http://hg.python.org/cpython
