From cf0669ade3a063ceed19025e03b7f385f40a3b09 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 24 Apr 2025 15:02:43 +0200 Subject: [PATCH] fixup! cluster/websocket: Automatic WebSocket client topic subscription --- .../..client..stdout | 2 +- .../..client..stdout | 2 +- testing/btest/cluster/websocket/broker/auto-subscription.zeek | 3 +-- testing/btest/cluster/websocket/zeromq/auto-subscription.zeek | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/testing/btest/Baseline/cluster.websocket.broker.auto-subscription/..client..stdout b/testing/btest/Baseline/cluster.websocket.broker.auto-subscription/..client..stdout index a211c39354..25121ef1be 100644 --- a/testing/btest/Baseline/cluster.websocket.broker.auto-subscription/..client..stdout +++ b/testing/btest/Baseline/cluster.websocket.broker.auto-subscription/..client..stdout @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. connected got ack -ack[endpoint] in topic_parts True +ack[endpoint] in topic True event [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 42}]}] diff --git a/testing/btest/Baseline/cluster.websocket.zeromq.auto-subscription/..client..stdout b/testing/btest/Baseline/cluster.websocket.zeromq.auto-subscription/..client..stdout index a211c39354..25121ef1be 100644 --- a/testing/btest/Baseline/cluster.websocket.zeromq.auto-subscription/..client..stdout +++ b/testing/btest/Baseline/cluster.websocket.zeromq.auto-subscription/..client..stdout @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. connected got ack -ack[endpoint] in topic_parts True +ack[endpoint] in topic True event [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 42}]}] diff --git a/testing/btest/cluster/websocket/broker/auto-subscription.zeek b/testing/btest/cluster/websocket/broker/auto-subscription.zeek index 1ba4ea7e97..ceb79d01a8 100644 --- a/testing/btest/cluster/websocket/broker/auto-subscription.zeek +++ b/testing/btest/cluster/websocket/broker/auto-subscription.zeek @@ -78,8 +78,7 @@ def run(ws_url): tc.send_json(wstest.build_event_v1("/test/pings/", "ping", [42])) pong = tc.recv_json(timeout=3) topic, event = pong["topic"], pong["data"][2]["data"][0:2] - topic_parts = topic.split("/") - print("ack[endpoint] in topic_parts", ack["endpoint"] in topic_parts) + print("ack[endpoint] in topic", ack["endpoint"] in topic) print("event", event) diff --git a/testing/btest/cluster/websocket/zeromq/auto-subscription.zeek b/testing/btest/cluster/websocket/zeromq/auto-subscription.zeek index 1b9b13db96..21119acbfb 100644 --- a/testing/btest/cluster/websocket/zeromq/auto-subscription.zeek +++ b/testing/btest/cluster/websocket/zeromq/auto-subscription.zeek @@ -76,8 +76,7 @@ def run(ws_url): tc.send_json(wstest.build_event_v1("/test/pings/", "ping", [42])) pong = tc.recv_json(timeout=3) topic, event = pong["topic"], pong["data"][2]["data"][0:2] - topic_parts = topic.split(".") - print("ack[endpoint] in topic_parts", ack["endpoint"] in topic_parts) + print("ack[endpoint] in topic", ack["endpoint"] in topic) print("event", event)