Merge pull request #7315 from bluetech/rm-__multicall__

testing: change a test to not use deprecated pluggy __multicall__ protocol
2020-06-03 12:31:35 -07:00 · 2020-06-03 12:31:35 -07:00 · e75531791d
parent 61a6ac9705 2e219ad4f3
commit e75531791d
1 changed files with 3 additions and 2 deletions
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@ -506,9 +506,10 @@ def test_runtest_in_module_ordering(testdir) -> None:
            @pytest.fixture
            def mylist(self, request):
                return request.function.mylist
-            def pytest_runtest_call(self, item, __multicall__):
+            @pytest.hookimpl(hookwrapper=True)
+            def pytest_runtest_call(self, item):
                try:
-                    __multicall__.execute()
+                    (yield).get_result()
                except ValueError:
                    pass
            def test_hello1(self, mylist):