From 25fa01d5cdbb1e5a3fe9ba5b728e6aea6407a6f3 Mon Sep 17 00:00:00 2001
From: Florian Schulze <mail@florian-schulze.net>
Date: Tue, 20 Jun 2023 12:38:39 +0200
Subject: [PATCH] Replace py.io.StdCaptureFD with _pytest.capture.MultiCapture.
 Refs #930

---
 client/testing/conftest.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/testing/conftest.py b/client/testing/conftest.py
index 9abc3ed7c..cddad0e4d 100644
--- a/client/testing/conftest.py
+++ b/client/testing/conftest.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
+from _pytest import capture
 from contextlib import closing
 from devpi_common.metadata import parse_version
 from io import StringIO
@@ -522,8 +523,11 @@ def doit(*args, **kwargs):
 def out_devpi(devpi):
     def out_devpi_func(*args, **kwargs):
         from _pytest.pytester import RunResult
-        cap = py.io.StdCaptureFD()
-        cap.startall()
+        cap = capture.MultiCapture(
+            in_=capture.FDCapture(0),
+            out=capture.FDCapture(1),
+            err=capture.FDCapture(2))
+        cap.start_capturing()
         now = time.time()
         ret = 0
         try:
@@ -532,7 +536,8 @@ def out_devpi_func(*args, **kwargs):
                 if getattr(hub, "sysex", None):
                     ret = hub.sysex.args[0]
             finally:
-                out, err = cap.reset()
+                (out, err) = cap.readouterr()
+                cap.stop_capturing()
                 del cap
         except BaseException:
             print(out)