Skip to content
Permalink
Browse files

tests: get_closest_marker for localsshmanager

The pytest setup function still uses the deprecated get_marker function.
Replace it with the new get_closest_marker function.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
  • Loading branch information...
Emantor authored and jluebbe committed Apr 5, 2019
1 parent 3f62440 commit cd7ff1d95f520c4e370201f004e9c85f3cd116cf
Showing with 1 addition and 1 deletion.
  1. +1 −1 tests/conftest.py
@@ -101,7 +101,7 @@ def pytest_runtest_setup(item):
if envmarker is not None:
if item.config.getoption("--sigrok-usb") is False:
pytest.skip("sigrok usb tests not enabled (enable with --sigrok-usb)")
envmarker = item.get_marker("localsshmanager")
envmarker = item.get_closest_marker("localsshmanager")
if envmarker is not None:
if item.config.getoption("--local-sshmanager") is False:
pytest.skip("SSHManager tests against localhost not enabled (enable with --local-sshmanager)")

0 comments on commit cd7ff1d

Please sign in to comment.
You can’t perform that action at this time.