Skip .match on older pytest (pre-3.0)

Fixes test failure on Fedora 25.
This commit is contained in:
Jason Rhinelander 2017-02-25 16:33:44 -05:00 committed by Wenzel Jakob
parent 0861be05da
commit df244884c0

View File

@ -34,8 +34,10 @@ def test_named_arguments(msg):
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
# noinspection PyArgumentList # noinspection PyArgumentList
kw_func2(x=5, y=10, z=12) kw_func2(x=5, y=10, z=12)
assert excinfo.match( if hasattr(excinfo, "match"): # (pytest <3.0 doesn't have `.match()`)
r'(?s)^kw_func2\(\): incompatible.*Invoked with: kwargs: ((x=5|y=10|z=12)(, |$))' + '{3}$') assert excinfo.match(
r'(?s)^kw_func2\(\): incompatible.*Invoked with: kwargs: ((x=5|y=10|z=12)(, |$))' +
'{3}$')
assert kw_func4() == "{13 17}" assert kw_func4() == "{13 17}"
assert kw_func4(myList=[1, 2, 3]) == "{1 2 3}" assert kw_func4(myList=[1, 2, 3]) == "{1 2 3}"