From 757b4492d75c899d21809ff51f3383189c7eb3c7 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 13 May 2022 13:29:08 -0400
Subject: [PATCH] A more semantically correct fix.

---
 integration/test_tor.py | 16 ++++++++--------
 integration/util.py     |  9 +++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/integration/test_tor.py b/integration/test_tor.py
index 5b701287c..d17e0f5cf 100644
--- a/integration/test_tor.py
+++ b/integration/test_tor.py
@@ -21,8 +21,7 @@ from . import util
 from twisted.python.filepath import (
     FilePath,
 )
-from twisted.internet.task import deferLater
-from twisted.internet import reactor
+
 from allmydata.test.common import (
     write_introducer,
 )
@@ -41,8 +40,11 @@ if PY2:
 
 @pytest_twisted.inlineCallbacks
 def test_onion_service_storage(reactor, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl):
-    yield _create_anonymous_node(reactor, 'carol', 8008, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl)
-    yield _create_anonymous_node(reactor, 'dave', 8009, 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)
+    util.await_client_ready(carol, expected_number_of_servers=2)
+    util.await_client_ready(dave, expected_number_of_servers=2)
+
     # ensure both nodes are connected to "a grid" by uploading
     # something via carol, and retrieve it using dave.
     gold_path = join(temp_dir, "gold")
@@ -69,9 +71,6 @@ def test_onion_service_storage(reactor, request, temp_dir, flog_gatherer, tor_ne
     cap = proto.output.getvalue().strip().split()[-1]
     print("TEH CAP!", cap)
 
-    # For some reason a wait is needed, or sometimes the get fails...
-    yield deferLater(reactor, 2, lambda: None)
-    
     proto = util._CollectOutputProtocol(capture_stderr=False)
     reactor.spawnProcess(
         proto,
@@ -147,5 +146,6 @@ shares.total = 2
         f.write(node_config)
 
     print("running")
-    yield util._run_node(reactor, node_dir.path, request, None)
+    result = yield util._run_node(reactor, node_dir.path, request, None)
     print("okay, launched")
+    return result
diff --git a/integration/util.py b/integration/util.py
index 7c7a1efd2..0ec824f82 100644
--- a/integration/util.py
+++ b/integration/util.py
@@ -482,14 +482,15 @@ def web_post(tahoe, uri_fragment, **kwargs):
     return resp.content
 
 
-def await_client_ready(tahoe, timeout=10, liveness=60*2):
+def await_client_ready(tahoe, timeout=10, liveness=60*2, expected_number_of_servers=1):
     """
     Uses the status API to wait for a client-type node (in `tahoe`, a
     `TahoeProcess` instance usually from a fixture e.g. `alice`) to be
     'ready'. A client is deemed ready if:
 
       - it answers `http://<node_url>/statistics/?t=json/`
-      - there is at least one storage-server connected
+      - there is at least one storage-server connected (configurable via
+        ``expected_number_of_servers``)
       - every storage-server has a "last_received_data" and it is
         within the last `liveness` seconds
 
@@ -506,8 +507,8 @@ def await_client_ready(tahoe, timeout=10, liveness=60*2):
             time.sleep(1)
             continue
 
-        if len(js['servers']) == 0:
-            print("waiting because no servers at all")
+        if len(js['servers']) != expected_number_of_servers:
+            print("waiting because insufficient servers")
             time.sleep(1)
             continue
         server_times = [