From 623de2b8b4d32d395309b36b8120409fb7e3d2d4 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 21 Jul 2023 12:28:02 -0400 Subject: [PATCH] use the helper --- integration/conftest.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index a0a278067..082b24cf1 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -541,15 +541,13 @@ def tor_network(reactor, temp_dir, chutney, request): }) chutney_argv = (sys.executable, '-m', 'chutney.TorNet') def chutney(argv): - proto = _DumpOutputProtocol(None) - reactor.spawnProcess( - proto, + return dump_output( + reactor, sys.executable, chutney_argv + argv, path=join(chutney_root), env=env, ) - return proto.done # now, as per Chutney's README, we have to create the network pytest_twisted.blockon(chutney(("configure", basic_network)))