[pypy-commit] cffi default: pypy compat

arigo noreply at buildbot.pypy.org
Sat May 30 14:01:44 CEST 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2133:a0a5812b5d41
Date: 2015-05-30 14:02 +0200
http://bitbucket.org/cffi/cffi/changeset/a0a5812b5d41/

Log:	pypy compat

diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
--- a/testing/cffi1/test_recompiler.py
+++ b/testing/cffi1/test_recompiler.py
@@ -874,9 +874,11 @@
     """)
     # can't read or write it at all
     e = py.test.raises(TypeError, getattr, lib, 'globvar')
-    assert str(e.value) == "cdata 'opaque_t' is opaque"
+    assert str(e.value) in ["cdata 'opaque_t' is opaque",
+                            "'opaque_t' is opaque or not completed yet"] #pypy
     e = py.test.raises(TypeError, setattr, lib, 'globvar', [])
-    assert str(e.value) == "'opaque_t' is opaque"
+    assert str(e.value) in ["'opaque_t' is opaque",
+                            "'opaque_t' is opaque or not completed yet"] #pypy
     # but we can get its address
     p = ffi.addressof(lib, 'globvar')
     assert ffi.typeof(p) == ffi.typeof('opaque_t *')


More information about the pypy-commit mailing list