Fix race condition in subscription tests (#1197)

* test: Avoid race with subscription and write.

* Count updates correctly and do assertions after cleanup.

* Make sure socket does not timeout during test

Author: danielballan

tiled/_tests/conftest.py

@@ -324,15 +324,16 @@ def tiled_websocket_context(tmpdir, redis_uri):
         ],
         readable_storage=None,
         init_if_not_exists=True,
+        # This uses shorter defaults than the production defaults. Nothing in
+        # the test suite should be going on for more than ten minutes.
         cache_settings={
             "uri": redis_uri,
-            "data_ttl": 60,
-            "seq_ttl": 60,
-            "socket_timeout": 10.0,
-            "socket_connect_timeout": 10.0,
+            "data_ttl": 600,  # 10 minutes
+            "seq_ttl": 600,  # 10 minutes
+            "socket_timeout": 600,  # 10 minutes
+            "socket_connect_timeout": 10,
         },
     )
-
     app = build_app(
         tree,
         authentication=Authentication(single_user_api_key="secret"),

tiled/_tests/test_writing.py

@@ -435,14 +435,14 @@ def test_replace_metadata(tiled_websocket_context):
     def callback(subscription, data):
         """Callback to collect received messages."""
         received.append(data)
-        if len(received) >= 3:  # 3 updates
+        if len(received) >= 4:  # 1 creation + 3 updates
             received_event.set()
 
     # Create subscription for the streaming node with start=0
     subscription = Subscription(context=context, segments=[])
     subscription.add_callback(callback)
     # Start the subscription
-    subscription.start_in_thread()
+    subscription.start_in_thread(start=1)
     # Business Logic
     assert len(ac.metadata_revisions[:]) == 0
     ac.replace_metadata(metadata={"a": 1})  # update #1
@@ -460,11 +460,11 @@ def callback(subscription, data):
     ac.replace_metadata(metadata={"3": 1}, drop_revision=True)  # update #3
     # Wait for all messages to be received
     assert received_event.wait(timeout=5.0), "Timeout waiting for messages"
-    # Ensure each event generated a websocket response
-    assert len(received) == 3
     # Clean up the subscription
     subscription.stop()
     assert subscription.closed
+    # Ensure each event generated a websocket response
+    assert len(received) == 4
 
 
 def test_drop_revision(tree):