diff --git a/cfme/fixtures/nelson.py b/cfme/fixtures/nelson.py index a749484f72..bc5e00153a 100644 --- a/cfme/fixtures/nelson.py +++ b/cfme/fixtures/nelson.py @@ -23,7 +23,7 @@ def get_meta(obj): return p.metadata -def pytest_collection_modifyitems(items): +def pytest_collection_modifyitems(session, config, items): output = {} for item in items: item_class = item.location[0] diff --git a/cfme/fixtures/ui_coverage.py b/cfme/fixtures/ui_coverage.py index e47ca03b20..bb425d278c 100644 --- a/cfme/fixtures/ui_coverage.py +++ b/cfme/fixtures/ui_coverage.py @@ -265,7 +265,7 @@ def pytest_sessionstart(self, session): conf.save('.ui-coverage') @pytest.hookimpl(hookwrapper=True) - def pytest_collection_finish(self): + def pytest_collection_finish(session): yield # Install coverage after collection finishes if store.parallelizer_role != 'master': diff --git a/cfme/fixtures/xunit_tools.py b/cfme/fixtures/xunit_tools.py index 179e14b134..e045ffe122 100644 --- a/cfme/fixtures/xunit_tools.py +++ b/cfme/fixtures/xunit_tools.py @@ -318,7 +318,7 @@ def gen_duplicates_log(items): @pytest.hookimpl(trylast=True) -def pytest_collection_modifyitems(config, items): +def pytest_collection_modifyitems(session, config, items): """Generates the XML files using collected items.""" if not (config.getoption('generate_xmls') or config.getoption('generate_legacy_xmls')): return diff --git a/cfme/markers/manual.py b/cfme/markers/manual.py index d729ca7fed..40c00ae066 100644 --- a/cfme/markers/manual.py +++ b/cfme/markers/manual.py @@ -17,7 +17,7 @@ def pytest_addoption(parser): @pytest.hookimpl(tryfirst=True) -def pytest_collection_modifyitems(config, items): +def pytest_collection_modifyitems(session, config, items): if config.getvalue('include_manual'): return is_manual = config.getvalue('manual') diff --git a/cfme/markers/perf.py b/cfme/markers/perf.py index 5ed6d31f87..2fa7a15103 100644 --- a/cfme/markers/perf.py +++ b/cfme/markers/perf.py @@ -3,7 +3,7 @@ @pytest.hookimpl(tryfirst=True) -def pytest_collection_modifyitems(items): +def pytest_collection_modifyitems(session, config, items): # mark all perf tests here so we don't have to maintain the mark in those modules for item in items: if item.nodeid.startswith('cfme/tests/perf'): diff --git a/cfme/markers/polarion.py b/cfme/markers/polarion.py index 417f46d2b5..c3569e0129 100644 --- a/cfme/markers/polarion.py +++ b/cfme/markers/polarion.py @@ -16,7 +16,7 @@ def extract_polarion_ids(item): @pytest.hookimpl(tryfirst=True) -def pytest_collection_modifyitems(config, items): +def pytest_collection_modifyitems(session, config, items): xml = getattr(config, '_xml', None) if xml is None: return