Change test_pwd and test_grp so they can handle duplicate user
and group names. This should fix SF bug #724771.
diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py
index 6cc52d7..dbdea79 100644
--- a/Lib/test/test_pwd.py
+++ b/Lib/test/test_pwd.py
@@ -7,6 +7,7 @@
def test_values(self):
entries = pwd.getpwall()
+ entriesbyname = {}
entriesbyuid = {}
for e in entries:
@@ -26,17 +27,18 @@
self.assertEqual(e[6], e.pw_shell)
self.assert_(isinstance(e.pw_shell, basestring))
- self.assertEqual(pwd.getpwnam(e.pw_name), e)
# The following won't work, because of duplicate entries
# for one uid
# self.assertEqual(pwd.getpwuid(e.pw_uid), e)
# instead of this collect all entries for one uid
# and check afterwards
+ entriesbyname.setdefault(e.pw_name, []).append(e)
entriesbyuid.setdefault(e.pw_uid, []).append(e)
# check whether the entry returned by getpwuid()
# for each uid is among those from getpwall() for this uid
for e in entries:
+ self.assert_(pwd.getpwnam(e.pw_name) in entriesbyname[e.pw_name])
self.assert_(pwd.getpwuid(e.pw_uid) in entriesbyuid[e.pw_uid])
def test_errors(self):