Skip to content

Fix python3.8 / pypy failures #4804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2019
Merged

Fix python3.8 / pypy failures #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions testing/code/test_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,6 @@ def test_oneline_and_comment():
assert str(source) == "raise ValueError"


@pytest.mark.xfail(hasattr(sys, "pypy_version_info"), reason="does not work on pypy")
def test_comments():
source = '''def test():
"comment 1"
Expand All @@ -576,9 +575,15 @@ def test_comments():
'''
for line in range(2, 6):
assert str(getstatement(line, source)) == " x = 1"
for line in range(6, 10):
if sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
tqs_start = 8
else:
tqs_start = 10
assert str(getstatement(10, source)) == '"""'
for line in range(6, tqs_start):
assert str(getstatement(line, source)) == " assert False"
assert str(getstatement(10, source)) == '"""'
for line in range(tqs_start, 10):
assert str(getstatement(line, source)) == '"""\ncomment 4\n"""'


def test_comment_in_statement():
Expand Down
5 changes: 4 additions & 1 deletion testing/test_skipping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,6 @@ def test_foo():
result.stdout.fnmatch_lines(["ERROR*test_foo*"])


@pytest.mark.xfail("hasattr(sys, 'pypy_version_info')")
def test_errors_in_xfail_skip_expressions(testdir):
testdir.makepyfile(
"""
Expand All @@ -931,6 +930,10 @@ def test_func():
if sys.platform.startswith("java"):
# XXX report this to java
markline = "*" + markline[8:]
elif hasattr(sys, "pypy_version_info") and sys.pypy_version_info < (6,):
markline = markline[5:]
elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
markline = markline[4:]
result.stdout.fnmatch_lines(
[
"*ERROR*test_nameerror*",
Expand Down