diff options
| author | Javier Jardón <jjardon@gnome.org> | 2019-01-15 23:23:41 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2019-01-15 23:23:41 +0000 |
| commit | ecae4d73661d09b249d7ba374fc8722813a13682 (patch) | |
| tree | 4545720d78600520adddbcb7d97eb30cfa4d1f08 | |
| parent | 80fe0d9a843688e5286ddb819a08fafc1819db93 (diff) | |
| parent | c91784abcdfebef2e1e70612193b67efe7fa016a (diff) | |
| download | buildstream-ecae4d73661d09b249d7ba374fc8722813a13682.tar.gz | |
Merge branch 'chandan/fix-pytest-get-marker' into 'master'
conftest.py: Don't use deprecated get_marker() function
See merge request BuildStream/buildstream!1073
| -rwxr-xr-x | conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conftest.py b/conftest.py index f3c09a5fb..b0b1e280e 100755 --- a/conftest.py +++ b/conftest.py @@ -32,7 +32,7 @@ def pytest_addoption(parser): def pytest_runtest_setup(item): - if item.get_marker('integration') and not item.config.getvalue('integration'): + if item.get_closest_marker('integration') and not item.config.getvalue('integration'): pytest.skip('skipping integration test') |