Skip to content
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

Jump to bottom

Pathlib /tests/conftest.py #6290

Merged
merged 9 commits into from Mar 19, 2021
Merged

Pathlib /tests/conftest.py #6290

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
479c651
Replaced os.path by pathlib equivalent in tests/conftest.py
bionicmann Mar 3, 2021
6eb12de
Removed unused import
bionicmann Mar 10, 2021
63dded1
Merge branch 'master' into pathlib-/tests/conftest.py
bionicmann Mar 10, 2021
4188598
Changed joinpath to /
bionicmann Mar 11, 2021
5faf293
added str
bionicmann Mar 16, 2021
0df8dcb
Merge branch 'master' into pathlib-/tests/conftest.py
bionicmann Mar 16, 2021
f0c13a7
Added fspath = pathlib.Path(path)
bionicmann Mar 19, 2021
6d3edf7
Merge branch 'master' into pathlib-/tests/conftest.py
bionicmann Mar 19, 2021
169062f
relative_to instead of is_relative
bionicmann Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"""The qutebrowser test suite conftest file."""

import os
import pathlib
import sys
import warnings
import pathlib

import pytest
import hypothesis
Expand Down Expand Up @@ -184,8 +184,8 @@ def pytest_collection_modifyitems(config, items):
def pytest_ignore_collect(path):
"""Ignore BDD tests if we're unable to run them."""
skip_bdd = hasattr(sys, 'frozen')
rel_path = path.relto(os.path.dirname(__file__))
return rel_path == os.path.join('end2end', 'features') and skip_bdd
rel_path = path.relto(str(pathlib.Path(__file__).parent))
return rel_path == pathlib.Path('end2end') / 'end2end' and skip_bdd


@pytest.fixture(scope='session')
Expand Down