From 175473df407157db53276e0721fec324242e4bd2 Mon Sep 17 00:00:00 2001 From: meejah Date: Thu, 13 Apr 2023 00:37:32 -0600 Subject: [PATCH] longer timeouts, forget less --- integration/conftest.py | 2 +- integration/test_tor.py | 4 ++-- src/allmydata/introducer/server.py | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index 7a4234de7..e7e021016 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -512,7 +512,7 @@ def chutney(reactor, temp_dir: str) -> tuple[str, dict[str, str]]: chutney_dir, { "PYTHONPATH": join(chutney_dir, "lib"), - "CHUTNEY_START_TIME": "200", # default is 60 + "CHUTNEY_START_TIME": "600", # default is 60 } ) diff --git a/integration/test_tor.py b/integration/test_tor.py index c3041f6d3..10e326e46 100644 --- a/integration/test_tor.py +++ b/integration/test_tor.py @@ -33,8 +33,8 @@ if sys.platform.startswith('win'): def test_onion_service_storage(reactor, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl): carol = yield _create_anonymous_node(reactor, 'carol', 8008, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl) dave = yield _create_anonymous_node(reactor, 'dave', 8009, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl) - yield util.await_client_ready(carol, minimum_number_of_servers=2, timeout=60) - yield util.await_client_ready(dave, minimum_number_of_servers=2, timeout=60) + yield util.await_client_ready(carol, minimum_number_of_servers=2, timeout=600) + yield util.await_client_ready(dave, minimum_number_of_servers=2, timeout=600) # ensure both nodes are connected to "a grid" by uploading # something via carol, and retrieve it using dave. diff --git a/src/allmydata/introducer/server.py b/src/allmydata/introducer/server.py index e0ff138cc..5dad89ae8 100644 --- a/src/allmydata/introducer/server.py +++ b/src/allmydata/introducer/server.py @@ -68,10 +68,6 @@ def create_introducer(basedir=u"."): default_connection_handlers, foolscap_connection_handlers = create_connection_handlers(config, i2p_provider, tor_provider) tub_options = create_tub_options(config) - # we don't remember these because the Introducer doesn't make - # outbound connections. - i2p_provider = None - tor_provider = None main_tub = create_main_tub( config, tub_options, default_connection_handlers, foolscap_connection_handlers, i2p_provider, tor_provider,