use the helper
This commit is contained in:
parent
eb3f8f6219
commit
623de2b8b4
|
@ -541,15 +541,13 @@ def tor_network(reactor, temp_dir, chutney, request):
|
||||||
})
|
})
|
||||||
chutney_argv = (sys.executable, '-m', 'chutney.TorNet')
|
chutney_argv = (sys.executable, '-m', 'chutney.TorNet')
|
||||||
def chutney(argv):
|
def chutney(argv):
|
||||||
proto = _DumpOutputProtocol(None)
|
return dump_output(
|
||||||
reactor.spawnProcess(
|
reactor,
|
||||||
proto,
|
|
||||||
sys.executable,
|
sys.executable,
|
||||||
chutney_argv + argv,
|
chutney_argv + argv,
|
||||||
path=join(chutney_root),
|
path=join(chutney_root),
|
||||||
env=env,
|
env=env,
|
||||||
)
|
)
|
||||||
return proto.done
|
|
||||||
|
|
||||||
# now, as per Chutney's README, we have to create the network
|
# now, as per Chutney's README, we have to create the network
|
||||||
pytest_twisted.blockon(chutney(("configure", basic_network)))
|
pytest_twisted.blockon(chutney(("configure", basic_network)))
|
||||||
|
|
Loading…
Reference in New Issue