Merge pull request #10112 from mshriver/fix-pytest-hook-args

[1LP][RFR] Update pytest hook parameters

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]

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':

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

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')

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'):

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