From 2e219ad4f32a3533cce53b865fb7f6548478de66 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Wed, 3 Jun 2020 21:51:55 +0300
Subject: [PATCH] testing: change a test to not use deprecated pluggy
 __multicall__ protocol

It is slated to be removed in pluggy 1.0.
---
 testing/test_runner.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testing/test_runner.py b/testing/test_runner.py
index 7b0b27a4b..32620801d 100644
--- 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):