Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r3009:b19be645c9f5
Date: 2017-09-15 18:42 +0200
http://bitbucket.org/cffi/cffi/changeset/b19be645c9f5/
Log: Update the tests for pycparser 2.18
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
@@ -1,6 +1,6 @@
import sys, os, py
-from cffi import FFI, VerificationError, FFIError
+from cffi import FFI, VerificationError, FFIError, CDefError
from cffi import recompiler
from testing.udir import udir
from testing.support import u, long
@@ -1126,7 +1126,9 @@
def test_some_float_invalid_1():
ffi = FFI()
- py.test.raises(FFIError, ffi.cdef, "typedef long double... foo_t;")
+ py.test.raises((FFIError, # with pycparser <= 2.17
+ CDefError), # with pycparser >= 2.18
+ ffi.cdef, "typedef long double... foo_t;")
def test_some_float_invalid_2():
ffi = FFI()
diff --git a/testing/cffi1/test_verify1.py b/testing/cffi1/test_verify1.py
--- a/testing/cffi1/test_verify1.py
+++ b/testing/cffi1/test_verify1.py
@@ -1,5 +1,6 @@
import os, sys, math, py
from cffi import FFI, FFIError, VerificationError, VerificationMissing, model
+from cffi import CDefError
from cffi import recompiler
from testing.support import *
import _cffi_backend
@@ -2222,7 +2223,9 @@
def test_unsupported_some_primitive_types():
ffi = FFI()
- py.test.raises(FFIError, ffi.cdef, """typedef void... foo_t;""")
+ py.test.raises((FFIError, # with pycparser <= 2.17
+ CDefError), # with pycparser >= 2.18
+ ffi.cdef, """typedef void... foo_t;""")
#
ffi.cdef("typedef int... foo_t;")
py.test.raises(VerificationError, ffi.verify, "typedef float foo_t;")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
