From 1c11f9e7d4957fcb1312418feb65c6a56847586e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 27 Mar 2023 13:35:14 -0400 Subject: [PATCH] Add a little more debug info to the integration test suite output --- integration/conftest.py | 3 +++ integration/test_tor.py | 2 +- integration/util.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index 54632be26..280d98f72 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -321,7 +321,9 @@ def tor_introducer(reactor, temp_dir, flog_gatherer, request): pass request.addfinalizer(cleanup) + print("Waiting for introducer to be ready...") pytest_twisted.blockon(protocol.magic_seen) + print("Introducer ready.") return transport @@ -332,6 +334,7 @@ def tor_introducer_furl(tor_introducer, temp_dir): print("Don't see {} yet".format(furl_fname)) sleep(.1) furl = open(furl_fname, 'r').read() + print(f"Found Tor introducer furl: {furl}") return furl diff --git a/integration/test_tor.py b/integration/test_tor.py index 901858347..8398cf9a4 100644 --- a/integration/test_tor.py +++ b/integration/test_tor.py @@ -93,7 +93,7 @@ def _create_anonymous_node(reactor, name, control_port, request, temp_dir, flog_ web_port = "tcp:{}:interface=localhost".format(control_port + 2000) if True: - print("creating", node_dir.path) + print(f"creating {node_dir.path} with introducer {introducer_furl}") node_dir.makedirs() proto = util._DumpOutputProtocol(None) reactor.spawnProcess( diff --git a/integration/util.py b/integration/util.py index 05fef8fed..08c07a059 100644 --- a/integration/util.py +++ b/integration/util.py @@ -607,7 +607,7 @@ def await_client_ready(tahoe, timeout=10, liveness=60*2, minimum_number_of_serve continue if len(js['servers']) < minimum_number_of_servers: - print("waiting because insufficient servers") + print(f"waiting because {js['servers']} is fewer than required ({minimum_number_of_servers})") time.sleep(1) continue server_times = [