[pypy-commit] pypy cleanup-test_lib_pypy: Convert test_grp to regular (app-level) tests

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: cleanup-test_lib_pypy
Changeset: r95429:3b0149d37897
Date: 2018-12-06 16:55 +0000
http://bitbucket.org/pypy/pypy/changeset/3b0149d37897/

Log:	Convert test_grp to regular (app-level) tests

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
@@ -1,42 +1,38 @@
-from pypy.module.test_lib_pypy.support import import_lib_pypy
+import pytest
 
+grp = pytest.importorskip('grp')
 
-class AppTestGrp:
-    spaceconfig = dict(usemodules=('binascii', '_rawffi', 'itertools'))
 
-    def setup_class(cls):
-        cls.w_grp = import_lib_pypy(cls.space, 'grp',
-                                    "No grp module on this platform")
+def test_basic():
+    with pytest.raises(KeyError) as e:
+        grp.getgrnam("dEkLofcG")
+    assert e.value.args[0] == "'getgrnam(): name not found: dEkLofcG'"
+    for name in ["root", "wheel"]:
+        try:
+            g = grp.getgrnam(name)
+        except KeyError:
+            continue
+        assert g.gr_gid == 0
+        assert 'root' in g.gr_mem or g.gr_mem == []
+        assert g.gr_name == name
+        assert isinstance(g.gr_passwd, str)    # usually just 'x', don't hope :-)
+        g2 = grp.getgrnam(unicode(name))
+        assert g2 == g
+        break
+    else:
+        raise
 
-    def test_basic(self):
-        e = raises(KeyError, self.grp.getgrnam, "dEkLofcG")
-        assert e.value.args[0] == "'getgrnam(): name not found: dEkLofcG'"
-        for name in ["root", "wheel"]:
-            try:
-                g = self.grp.getgrnam(name)
-            except KeyError:
-                continue
-            assert g.gr_gid == 0
-            assert 'root' in g.gr_mem or g.gr_mem == []
-            assert g.gr_name == name
-            assert isinstance(g.gr_passwd, str)    # usually just 'x', don't hope :-)
-            g2 = self.grp.getgrnam(unicode(name))
-            assert g2 == g
-            break
-        else:
-            raise
+def test_extra():
+    with pytest.raises(TypeError):
+        grp.getgrnam(False)
+    with pytest.raises(TypeError):
+        grp.getgrnam(None)
 
-    def test_extra(self):
-        grp = self.grp
-        print(grp.__file__)
-        raises(TypeError, grp.getgrnam, False)
-        raises(TypeError, grp.getgrnam, None)
-
-    def test_struct_group(self):
-        g = self.grp.struct_group((10, 20, 30, 40))
-        assert len(g) == 4
-        assert list(g) == [10, 20, 30, 40]
-        assert g.gr_name == 10
-        assert g.gr_passwd == 20
-        assert g.gr_gid == 30
-        assert g.gr_mem == 40
+def test_struct_group():
+    g = grp.struct_group((10, 20, 30, 40))
+    assert len(g) == 4
+    assert list(g) == [10, 20, 30, 40]
+    assert g.gr_name == 10
+    assert g.gr_passwd == 20
+    assert g.gr_gid == 30
+    assert g.gr_mem == 40