[pypy-commit] pypy py3.5: hg merge default

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r95351:5811240c082f
Date: 2018-11-20 20:25 +0000
http://bitbucket.org/pypy/pypy/changeset/5811240c082f/

Log:	hg merge default

diff --git a/extra_tests/cffi_tests/cffi1/test_parse_c_type.py b/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
--- a/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
+++ b/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
@@ -4,7 +4,7 @@
 from cffi import cffi_opcode
 
 if '__pypy__' in sys.builtin_module_names:
-    py.test.skip("not available on pypy")
+    py.test.skip("not available on pypy", allow_module_level=True)
 
 cffi_dir = os.path.dirname(cffi_opcode.__file__)
 
diff --git a/pypy/module/_rawffi/alt/test/test_ffitype.py b/pypy/module/_rawffi/alt/test/test_ffitype.py
--- a/pypy/module/_rawffi/alt/test/test_ffitype.py
+++ b/pypy/module/_rawffi/alt/test/test_ffitype.py
@@ -1,6 +1,5 @@
-from pypy.module._rawffi.alt.test.test_funcptr import BaseAppTestFFI
-
-class AppTestFFIType(BaseAppTestFFI):
+class AppTestFFIType(object):
+    spaceconfig = dict(usemodules=('_rawffi',))
 
     def test_simple_types(self):
         from _rawffi.alt import types
@@ -8,7 +7,7 @@
         assert str(types.uint) == "<ffi type uint>"
         assert types.sint.name == 'sint'
         assert types.uint.name == 'uint'
-        
+
     def test_sizeof(self):
         from _rawffi.alt import types
         assert types.sbyte.sizeof() == 1
@@ -36,4 +35,3 @@
         assert x is types.char_p
         x = types.Pointer(types.unichar)
         assert x is types.unichar_p
-