ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-17 14:58:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch to pytest_twisted

Browse Source
This commit is contained in:
Jean-Paul Calderone
2019-02-05 11:03:35 -05:00
parent e57449e055
commit f905d80760
5 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration/util.py
View File

@ -14,7 +14,7 @@ from allmydata.util.configutil import (
write_config,
)
import pytest
import pytest_twisted
class _ProcessExitedProtocol(ProcessProtocol):
@ -127,7 +127,7 @@ def _run_node(reactor, node_dir, request, magic_text):
def cleanup():
try:
process.signalProcess('TERM')
pytest.blockon(protocol.exited)
pytest_twisted.blockon(protocol.exited)
except ProcessExitedAlready:
pass
request.addfinalizer(cleanup)