test/common.py: fix race condition waiting for the helper connection

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / common.py

diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py
index deb9d139cb659865dd179b8a1a102256fa83fdb7..e9103a2a1365925366622412011f395faf1d29d9 100644 (file)
--- a/src/allmydata/test/common.py
+++ b/src/allmydata/test/common.py
@@ -675,12 +675,12 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
             sb = c.get_storage_broker()
             if len(sb.get_connected_servers()) != self.numclients:
                 return False
+            up = c.getServiceNamed("uploader")
+            if up._helper_furl and not up._helper:
+                return False
         return True
 
     def wait_for_connections(self, ignored=None):
-        # TODO: replace this with something that takes a list of peerids and
-        # fires when they've all been heard from, instead of using a count
-        # and a threshold
         return self.poll(self._check_connections, timeout=200)