Use env.PYPY for more exact tests

Author: virtuald

tests/test_class.py

@@ -112,10 +112,12 @@ def __init__(self):
             pass
     with pytest.raises(TypeError) as exc_info:
         Python()
-    expected = ["m.class_.Pet.__init__() must be called when overriding __init__",
-                "Pet.__init__() must be called when overriding __init__"]  # PyPy?
+    if env.PYPY:
+        expected = "Pet.__init__() must be called when overriding __init__"
+    else:
+        expected = "m.class_.Pet.__init__() must be called when overriding __init__"
     # TODO: fix PyPy error message wrt. tp_name/__qualname__?
-    assert msg(exc_info.value) in expected
+    assert msg(exc_info.value) == expected
 
     # Multiple bases
     class RabbitHamster(m.Rabbit, m.Hamster):
@@ -124,9 +126,11 @@ def __init__(self):
 
     with pytest.raises(TypeError) as exc_info:
         RabbitHamster()
-    expected = ["m.class_.Hamster.__init__() must be called when overriding __init__",
-                "Hamster.__init__() must be called when overriding __init__"]  # PyPy
-    assert msg(exc_info.value) in expected
+    if env.PYPY:
+        expected = "Hamster.__init__() must be called when overriding __init__"
+    else:
+        expected = "m.class_.Hamster.__init__() must be called when overriding __init__"
+    assert msg(exc_info.value) == expected
 
 
 def test_automatic_upcasting():