Author: Brian Kearns <bdkea...@gmail.com>
Branch: 
Changeset: r67984:b1014f8d559c
Date: 2013-11-12 10:12 -0800
http://bitbucket.org/pypy/pypy/changeset/b1014f8d559c/

Log:    fix this test a bit more strictly

diff --git a/pypy/module/test_lib_pypy/test_grp_extra.py 
b/pypy/module/test_lib_pypy/test_grp_extra.py
--- a/pypy/module/test_lib_pypy/test_grp_extra.py
+++ b/pypy/module/test_lib_pypy/test_grp_extra.py
@@ -11,14 +11,18 @@
 
     def test_basic(self):
         raises(KeyError, self.grp.getgrnam, "dEkLofcG")
-        try:
-            g = self.grp.getgrnam("root")
-        except KeyError:
-            return     # no 'root' group on OS/X?
-        assert g.gr_gid == 0
-        assert g.gr_mem == ['root'] or g.gr_mem == []
-        assert g.gr_name == 'root'
-        assert isinstance(g.gr_passwd, str)    # usually just 'x', don't hope 
:-)
+        for name in ["root", "wheel"]:
+            try:
+                g = self.grp.getgrnam(name)
+            except KeyError:
+                continue
+            assert g.gr_gid == 0
+            assert g.gr_mem == ['root'] or g.gr_mem == []
+            assert g.gr_name == name
+            assert isinstance(g.gr_passwd, str)    # usually just 'x', don't 
hope :-)
+            break
+        else:
+            raise
 
     def test_extra(self):
         grp = self.grp
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to