8000 [MRG] Define custom markers for pytest. by cmarmo · Pull Request #16652 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

[MRG] Define custom markers for pytest. #16652

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 9 commits into from
Mar 23, 2020
Merged

[MRG] Define custom markers for pytest. #16652

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc41104
Define custom markers for pytest.
cmarmo Mar 6, 2020
5cabc75
Add pytest.ini
cmarmo Mar 9, 2020
c23505b
Tentative general solution for Linux and Windows builds.
cmarmo Mar 9, 2020
7a51baa
Merge branch 'master' into unknown-pytest-mark
cmarmo Mar 13, 2020
2808018
Force build
cmarmo Mar 13, 2020
f75190c
Update conftest.py
cmarmo Mar 13, 2020
0e75f48
Fix lint error.
cmarmo Mar 13, 2020
9133b60
Force push
cmarmo Mar 14, 2020
d4ed7bb
Merge branch 'master' into unknown-pytest-mark
cmarmo Mar 19, 2020
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
5 changes: 5 additions & 0 deletions conftest.py
View file 847A
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ def pytest_collection_modifyitems(config, items):
def pytest_configure(config):
import sys
sys._is_pytest_session = True
# declare our custom markers to avoid PytestUnknownMarkWarning
config.addinivalue_line(
"markers",
"network: mark a test for execution if network available."
)


def pytest_unconfigure(config):
Expand Down
0