From b1520c8d71180ca9206d38b38f48d2b57b5eb592 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 7 Aug 2018 15:22:19 -0400
Subject: [PATCH] Some improved logging while waiting for connections

---
 src/allmydata/test/test_system.py | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 357661eaa..5cb985beb 100644
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -680,14 +680,38 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
         return d
 
     def _check_connections(self):
-        for c in self.clients:
+        for i, c in enumerate(self.clients):
             if not c.connected_to_introducer():
+                log.msg("%s not connected to introducer yet" % (i,))
                 return False
             sb = c.get_storage_broker()
-            if len(sb.get_connected_servers()) != self.numclients:
+            connected_servers = sb.get_connected_servers()
+            connected_names = sorted(list(
+                connected.get_nickname()
+                for connected
+                in sb.get_known_servers()
+                if connected.is_connected()
+            ))
+            if len(connected_servers) != self.numclients:
+                wanted = sorted(list(
+                    client.nickname
+                    for client
+                    in self.clients
+                ))
+                log.msg(
+                    "client %s storage broker connected to %s, missing %s" % (
+                        i,
+                        connected_names,
+                        set(wanted) - set(connected_names),
+                    )
+                )
                 return False
+            log.msg("client %s storage broker connected to %s, happy" % (
+                i, connected_names,
+            ))
             up = c.getServiceNamed("uploader")
             if up._helper_furl and not up._helper:
+                log.msg("Helper fURL but no helper")
                 return False
         return True