Skip to content

Support pytest 9 changes #590

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

Open
s-t-e-v-e-n-k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support pytest 9 changes #590

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
18 changes: 9 additions & 9 deletions html5lib/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,22 +90,22 @@ def pytest_configure(config):
pytest.exit("\n".join(msgs))


def pytest_collect_file(path, parent):
dir = os.path.abspath(path.dirname)
def pytest_collect_file(file_path, parent):
dir = file_path.parent
dir_and_parents = set()
while dir not in dir_and_parents:
dir_and_parents.add(dir)
dir = os.path.dirname(dir)
dir = dir.parent

if _tree_construction in dir_and_parents:
if path.ext == ".dat":
return TreeConstructionFile.from_parent(parent, fspath=path)
if file_path.suffix == ".dat":
return TreeConstructionFile.from_parent(parent, path=file_path)
elif _tokenizer in dir_and_parents:
if path.ext == ".test":
return TokenizerFile.from_parent(parent, fspath=path)
if file_path.suffix == ".test":
return TokenizerFile.from_parent(parent, path=file_path)
elif _sanitizer_testdata in dir_and_parents:
if path.ext == ".dat":
return SanitizerFile.from_parent(parent, fspath=path)
if file_path.suffix == ".dat":
return SanitizerFile.from_parent(parent, path=file_path)


# Tiny wrapper to allow .from_parent constructors on older pytest for PY27
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flake8==3.9.2 ; python_version < '3.6'
flake8>=5.0.4; python_version >= '3.6'
pytest>=4.6.10,<5 ; python_version < '3'
pytest>=5.4.2,<8 ; python_version >= '3'
pytest>=7,<10 ; python_version >= '3'
coverage>=5.1,<6
pytest-expect>=1.1.0,<2
mock>=3.0.5,<4 ; python_version < '3.3'
Expand Down