Merge branch '3891-mutable-http-protocol-part-2' into 3893-mutable-http-protocol-part-3

integration/test_tor.py

@@ -40,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)
+    carol = 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)
+    dave = yield _create_anonymous_node(reactor, 'dave', 8009, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl)
+    util.await_client_ready(carol, minimum_number_of_servers=2)
+    util.await_client_ready(dave, minimum_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")
@@ -143,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

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, minimum_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
+        ``minimum_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:
+        if len(js['servers']) < minimum_number_of_servers:
-            print("waiting because no servers at all")
+            print("waiting because insufficient servers")
             time.sleep(1)
             continue
         server_times = [

setup.py

@@ -114,7 +114,7 @@ install_requires = [
     "attrs >= 18.2.0",
 
     # WebSocket library for twisted and asyncio
-    "autobahn < 22.4.1",  # remove this when https://github.com/crossbario/autobahn-python/issues/1566 is fixed
+    "autobahn < 22.4.1",  # remove this when 22.4.3 is released
 
     # Support for Python 3 transition
     "future >= 0.18.2",

tox.ini

@@ -97,7 +97,7 @@ setenv =
          COVERAGE_PROCESS_START=.coveragerc
 commands =
          # NOTE: 'run with "py.test --keep-tempdir -s -v integration/" to debug failures'
-         py.test --timeout=1800 --coverage -v {posargs:integration}
+         py.test --timeout=1800 --coverage -s -v {posargs:integration}
          coverage combine
          coverage report