[pypy-commit] pypy cffi-1.0: Make the cffi tests pass on a translated pypy

arigo noreply at buildbot.pypy.org
Mon May 18 23:56:14 CEST 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: cffi-1.0
Changeset: r77386:04b1ea6dd195
Date: 2015-05-18 23:56 +0200
http://bitbucket.org/pypy/pypy/changeset/04b1ea6dd195/

Log:	Make the cffi tests pass on a translated pypy

diff --git a/lib_pypy/cffi/testing/__init__.py b/lib_pypy/cffi/testing/__init__.py
new file mode 100644
diff --git a/lib_pypy/cffi/testing/udir.py b/lib_pypy/cffi/testing/udir.py
new file mode 100644
--- /dev/null
+++ b/lib_pypy/cffi/testing/udir.py
@@ -0,0 +1,3 @@
+import py
+
+udir = py.path.local.make_numbered_dir(prefix = 'ffi-')
diff --git a/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_parse_c_type.py b/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_parse_c_type.py
--- a/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_parse_c_type.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_parse_c_type.py
@@ -3,6 +3,9 @@
 import cffi
 from cffi import cffi_opcode
 
+if '__pypy__' in sys.builtin_module_names:
+    py.test.skip("not available on pypy")
+
 cffi_dir = os.path.dirname(cffi_opcode.__file__)
 
 r_macro = re.compile(r"#define \w+[(][^\n]*|#include [^\n]*")
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_egg_version.py b/pypy/module/test_lib_pypy/cffi_tests/test_egg_version.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_egg_version.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_egg_version.py
@@ -5,7 +5,7 @@
 import cffi
 import pypy
 
-egg_info = py.path.local(pypy.__file__) / '../../lib_pypy/cffi.egg-info'
+egg_info = py.path.local(pypy.__file__)/'../../lib_pypy/cffi.egg-info/PKG-INFO'
 
 def test_egg_version():
     info = Parser().parsestr(egg_info.read())


More information about the pypy-commit mailing list