From df244884c0ecb5bf869d37944ea06aa218a4bc1a Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Sat, 25 Feb 2017 16:33:44 -0500 Subject: [PATCH] Skip .match on older pytest (pre-3.0) Fixes test failure on Fedora 25. --- tests/test_kwargs_and_defaults.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_kwargs_and_defaults.py b/tests/test_kwargs_and_defaults.py index 90f8489e..2b6b94f8 100644 --- a/tests/test_kwargs_and_defaults.py +++ b/tests/test_kwargs_and_defaults.py @@ -34,8 +34,10 @@ def test_named_arguments(msg): with pytest.raises(TypeError) as excinfo: # noinspection PyArgumentList kw_func2(x=5, y=10, z=12) - assert excinfo.match( - r'(?s)^kw_func2\(\): incompatible.*Invoked with: kwargs: ((x=5|y=10|z=12)(, |$))' + '{3}$') + if hasattr(excinfo, "match"): # (pytest <3.0 doesn't have `.match()`) + 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(myList=[1, 2, 3]) == "{1 2 3}"