From ce2363e3ded009bc3604a88af6445903dd45ea81 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 30 Jul 2021 11:08:56 -0400 Subject: [PATCH] More aggressively shut down i2pd and other i2p-related processes. --- integration/test_i2p.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/test_i2p.py b/integration/test_i2p.py index 4f212f5fb..1aa7a5d99 100644 --- a/integration/test_i2p.py +++ b/integration/test_i2p.py @@ -47,7 +47,7 @@ if sys.platform.startswith('win'): pytest.skip('Skipping I2P tests on Windows', allow_module_level=True) -@pytest.fixture(scope="session") +@pytest.fixture def i2p_network(reactor, temp_dir, request): """Fixture to start up local i2pd.""" proto = util._MagicTextProtocol("ephemeral keys") @@ -63,7 +63,7 @@ def i2p_network(reactor, temp_dir, request): def cleanup(): try: - proto.transport.signalProcess("INT") + proto.transport.signalProcess("KILL") util.block_with_timeout(proto.exited, reactor) except ProcessExitedAlready: pass @@ -72,7 +72,7 @@ def i2p_network(reactor, temp_dir, request): util.block_with_timeout(proto.magic_seen, reactor, timeout=30) -@pytest.fixture(scope='session') +@pytest.fixture @log_call( action_type=u"integration:i2p:introducer", include_args=["temp_dir", "flog_gatherer"], @@ -133,7 +133,7 @@ log_gatherer.furl = {log_furl} return transport -@pytest.fixture(scope='session') +@pytest.fixture def i2p_introducer_furl(i2p_introducer, temp_dir): furl_fname = join(temp_dir, 'introducer_i2p', 'private', 'introducer.furl') while not exists(furl_fname):