From 6d2bd93f1fc508082432362e6b4391a4c795af35 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 9 May 2025 16:34:42 +0200 Subject: [PATCH] btest/cluster/websocket: Update tests for new event signature --- .../..manager.cluster.log.cannonified | 6 +++--- testing/btest/cluster/websocket/bad-event-args.zeek | 2 +- testing/btest/cluster/websocket/bad-subscriptions.zeek | 2 +- testing/btest/cluster/websocket/bad-url.zeek | 2 +- testing/btest/cluster/websocket/broker/manager-recvs.zeek | 2 +- testing/btest/cluster/websocket/broker/manager-sends.zeek | 2 +- .../cluster/websocket/broker/manager-worker-ping-pong.zeek | 2 +- testing/btest/cluster/websocket/cluster-log.zeek | 2 +- testing/btest/cluster/websocket/one-pipelining.zeek | 2 +- testing/btest/cluster/websocket/one.zeek | 2 +- .../btest/cluster/websocket/terminate-while-queuing.zeek | 2 +- testing/btest/cluster/websocket/three.zeek | 2 +- testing/btest/cluster/websocket/tls.zeek | 2 +- testing/btest/cluster/websocket/two-pipelining.zeek | 2 +- .../cluster/websocket/zeromq/manager-worker-ping-pong.zeek | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified b/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified index bc1ec612fb..ea56a35efc 100644 --- a/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified +++ b/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified @@ -2,6 +2,6 @@ manager WebSocket client (127.0.0.1:) subscribed to [/topic/ws/1, /topic/ws/all] manager WebSocket client (127.0.0.1:) subscribed to [/topic/ws/2, /topic/ws/all] manager WebSocket client (127.0.0.1:) subscribed to [/topic/ws/3, /topic/ws/all] -manager WebSocket client (127.0.0.1:) gone -manager WebSocket client (127.0.0.1:) gone -manager WebSocket client (127.0.0.1:) gone +manager WebSocket client (127.0.0.1:) gone with code 1000 +manager WebSocket client (127.0.0.1:) gone with code 1000 +manager WebSocket client (127.0.0.1:) gone with code 1000 diff --git a/testing/btest/cluster/websocket/bad-event-args.zeek b/testing/btest/cluster/websocket/bad-event-args.zeek index ad938e1b84..323614d312 100644 --- a/testing/btest/cluster/websocket/bad-event-args.zeek +++ b/testing/btest/cluster/websocket/bad-event-args.zeek @@ -50,7 +50,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/bad-subscriptions.zeek b/testing/btest/cluster/websocket/bad-subscriptions.zeek index 7b32248793..be2cd473f4 100644 --- a/testing/btest/cluster/websocket/bad-subscriptions.zeek +++ b/testing/btest/cluster/websocket/bad-subscriptions.zeek @@ -47,7 +47,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", added, subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "Cluster::websocket_client_lost", lost; diff --git a/testing/btest/cluster/websocket/bad-url.zeek b/testing/btest/cluster/websocket/bad-url.zeek index 27215835a3..1e6349b25a 100644 --- a/testing/btest/cluster/websocket/bad-url.zeek +++ b/testing/btest/cluster/websocket/bad-url.zeek @@ -53,7 +53,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/broker/manager-recvs.zeek b/testing/btest/cluster/websocket/broker/manager-recvs.zeek index eaaf6e9127..c67f4425a9 100644 --- a/testing/btest/cluster/websocket/broker/manager-recvs.zeek +++ b/testing/btest/cluster/websocket/broker/manager-recvs.zeek @@ -63,7 +63,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost); diff --git a/testing/btest/cluster/websocket/broker/manager-sends.zeek b/testing/btest/cluster/websocket/broker/manager-sends.zeek index 51e396ac54..ff6fb86be2 100644 --- a/testing/btest/cluster/websocket/broker/manager-sends.zeek +++ b/testing/btest/cluster/websocket/broker/manager-sends.zeek @@ -66,7 +66,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions event send_ping(); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost); diff --git a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek index c1a63892e6..1420733269 100644 --- a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek +++ b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek @@ -94,7 +94,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost); diff --git a/testing/btest/cluster/websocket/cluster-log.zeek b/testing/btest/cluster/websocket/cluster-log.zeek index 544e363ee5..2f7ba20fc6 100644 --- a/testing/btest/cluster/websocket/cluster-log.zeek +++ b/testing/btest/cluster/websocket/cluster-log.zeek @@ -63,7 +63,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", added, subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "Cluster::websocket_client_lost", lost; diff --git a/testing/btest/cluster/websocket/one-pipelining.zeek b/testing/btest/cluster/websocket/one-pipelining.zeek index c73c530993..0f43142280 100644 --- a/testing/btest/cluster/websocket/one-pipelining.zeek +++ b/testing/btest/cluster/websocket/one-pipelining.zeek @@ -53,7 +53,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/one.zeek b/testing/btest/cluster/websocket/one.zeek index 420b63716e..bcd6b7775e 100644 --- a/testing/btest/cluster/websocket/one.zeek +++ b/testing/btest/cluster/websocket/one.zeek @@ -53,7 +53,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/terminate-while-queuing.zeek b/testing/btest/cluster/websocket/terminate-while-queuing.zeek index 54cc99b428..006fa55dc8 100644 --- a/testing/btest/cluster/websocket/terminate-while-queuing.zeek +++ b/testing/btest/cluster/websocket/terminate-while-queuing.zeek @@ -46,7 +46,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "B Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "E Cluster::websocket_client_lost"; } diff --git a/testing/btest/cluster/websocket/three.zeek b/testing/btest/cluster/websocket/three.zeek index 05e85d5708..3bf980cc8e 100644 --- a/testing/btest/cluster/websocket/three.zeek +++ b/testing/btest/cluster/websocket/three.zeek @@ -52,7 +52,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "B Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "D Cluster::websocket_client_lost", lost; diff --git a/testing/btest/cluster/websocket/tls.zeek b/testing/btest/cluster/websocket/tls.zeek index 4e9015cca3..bd816c5328 100644 --- a/testing/btest/cluster/websocket/tls.zeek +++ b/testing/btest/cluster/websocket/tls.zeek @@ -67,7 +67,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/two-pipelining.zeek b/testing/btest/cluster/websocket/two-pipelining.zeek index e70c3f2fff..fbf51da293 100644 --- a/testing/btest/cluster/websocket/two-pipelining.zeek +++ b/testing/btest/cluster/websocket/two-pipelining.zeek @@ -84,7 +84,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions drain_if_ready(); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "C Cluster::websocket_client_lost"; diff --git a/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek b/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek index 0212f601a8..b9f19948ef 100644 --- a/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek +++ b/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek @@ -93,7 +93,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost);