From 89999949e2aea8c083f764ae4091374339e42aae Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 22 Jul 2017 16:00:28 +0200 Subject: [PATCH] Move some 2.6 stuff around. --- test/test_python_errors.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test_python_errors.py b/test/test_python_errors.py index 4c59879..5a09b27 100644 --- a/test/test_python_errors.py +++ b/test/test_python_errors.py @@ -57,10 +57,8 @@ def test_indentation_errors(code, positions): @pytest.mark.parametrize( 'code', [ - # SyntaxError - # Python 2.6 has a bit different error messages here, so skip it. - pytest.mark.skipif('sys.version_info <= (2, 6)', '1 +'), - pytest.mark.skipif('sys.version_info <= (2, 6)', '?'), + '1 +', + '?', dedent('''\ for a in [1]: try: @@ -89,6 +87,11 @@ def test_python_exception_matches(code): wanted = e.__class__.__name__ + ': ' + e.msg else: assert False, "The piece of code should raise an exception." + + # SyntaxError + # Python 2.6 has a bit different error messages here, so skip it. + if sys.version_info[:2] == (2, 6) and wanted == 'SyntaxError: unexpected EOF while parsing': + wanted = 'SyntaxError: invalid syntax' assert wanted == error.message