jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix test_errors_in_xfail_skip_expressions on Python 3.10

This commit is contained in:
Florian Bruhin 2021-05-04 17:18:05 +02:00
parent 61be48b485
commit 382599287f
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
testing/test_skipping.py
View File

@ -1143,21 +1143,34 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None:
pypy_version_info = getattr(sys, "pypy_version_info", None) pypy_version_info = getattr(sys, "pypy_version_info", None)
if pypy_version_info is not None and pypy_version_info < (6,): if pypy_version_info is not None and pypy_version_info < (6,):
markline = markline[5:] markline = markline[5:]
elif sys.version_info[:2] >= (3, 10):
markline = markline[11:]
elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"): elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
markline = markline[4:] markline = markline[4:]
result.stdout.fnmatch_lines(
[ if sys.version_info[:2] >= (3, 10):
expected = [
"*ERROR*test_nameerror*", "*ERROR*test_nameerror*",
"*evaluating*skipif*condition*",
"*asd*", "*asd*",
"*ERROR*test_syntax*", "",
"*evaluating*xfail*condition*", "During handling of the above exception, another exception occurred:",
" syntax error",
markline,
"SyntaxError: invalid syntax",
"*1 pass*2 errors*",
] ]
) else:
expected = [
"*ERROR*test_nameerror*",
]
expected += [
"*evaluating*skipif*condition*",
"*asd*",
"*ERROR*test_syntax*",
"*evaluating*xfail*condition*",
" syntax error",
markline,
"SyntaxError: invalid syntax",
"*1 pass*2 errors*",
]
result.stdout.fnmatch_lines(expected)
def test_xfail_skipif_with_globals(pytester: Pytester) -> None: def test_xfail_skipif_with_globals(pytester: Pytester) -> None: