From 6ce9a33002309b6d3faef06c9b961bfa01e5fdb5 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 24 Sep 2025 12:56:51 +0200 Subject: [PATCH] btest/broker: Prepare for non-Broker default --- testing/btest/Baseline/broker.remote_event/recv.recv.out | 1 - .../btest/Baseline/broker.remote_event_any/recv.recv.out | 1 - .../Baseline/broker.remote_event_ssl_auth/recv.recv.out | 1 - testing/btest/Files/broker/cluster-layout.zeek | 2 ++ testing/btest/broker/remote_event.zeek | 6 ------ testing/btest/broker/remote_event_any.zeek | 6 ------ testing/btest/broker/remote_event_ssl_auth.zeek | 6 ------ testing/btest/broker/remote_log.zeek | 3 +++ testing/btest/broker/remote_log_batch.zeek | 3 +++ testing/btest/broker/remote_log_late_join.zeek | 3 +++ testing/btest/broker/remote_log_types.zeek | 3 +++ testing/btest/broker/telemetry.zeek | 1 + 12 files changed, 15 insertions(+), 21 deletions(-) diff --git a/testing/btest/Baseline/broker.remote_event/recv.recv.out b/testing/btest/Baseline/broker.remote_event/recv.recv.out index c13ab4ea41..fcd1b41ad2 100644 --- a/testing/btest/Baseline/broker.remote_event/recv.recv.out +++ b/testing/btest/Baseline/broker.remote_event/recv.recv.out @@ -10,4 +10,3 @@ is_remote should be T, and is, T receiver got ping: my-message, 4 is_remote should be T, and is, T receiver got ping: my-message, 5 -[num_peers=1, num_stores=0, num_pending_queries=0, num_events_incoming=5, num_events_outgoing=4, num_logs_incoming=0, num_logs_outgoing=1, num_ids_incoming=0, num_ids_outgoing=0] diff --git a/testing/btest/Baseline/broker.remote_event_any/recv.recv.out b/testing/btest/Baseline/broker.remote_event_any/recv.recv.out index c13ab4ea41..fcd1b41ad2 100644 --- a/testing/btest/Baseline/broker.remote_event_any/recv.recv.out +++ b/testing/btest/Baseline/broker.remote_event_any/recv.recv.out @@ -10,4 +10,3 @@ is_remote should be T, and is, T receiver got ping: my-message, 4 is_remote should be T, and is, T receiver got ping: my-message, 5 -[num_peers=1, num_stores=0, num_pending_queries=0, num_events_incoming=5, num_events_outgoing=4, num_logs_incoming=0, num_logs_outgoing=1, num_ids_incoming=0, num_ids_outgoing=0] diff --git a/testing/btest/Baseline/broker.remote_event_ssl_auth/recv.recv.out b/testing/btest/Baseline/broker.remote_event_ssl_auth/recv.recv.out index 7a0dc495f2..24ee373fe9 100644 --- a/testing/btest/Baseline/broker.remote_event_ssl_auth/recv.recv.out +++ b/testing/btest/Baseline/broker.remote_event_ssl_auth/recv.recv.out @@ -5,4 +5,3 @@ receiver got ping: my-message, 2 receiver got ping: my-message, 3 receiver got ping: my-message, 4 receiver got ping: my-message, 5 -[num_peers=1, num_stores=0, num_pending_queries=0, num_events_incoming=5, num_events_outgoing=4, num_logs_incoming=0, num_logs_outgoing=1, num_ids_incoming=0, num_ids_outgoing=0] diff --git a/testing/btest/Files/broker/cluster-layout.zeek b/testing/btest/Files/broker/cluster-layout.zeek index f495e8da29..1e995f83eb 100644 --- a/testing/btest/Files/broker/cluster-layout.zeek +++ b/testing/btest/Files/broker/cluster-layout.zeek @@ -18,6 +18,8 @@ # The existence of the environment variable will add a corresponding node # to Cluster::nodes. +# Explicitly set the broker backend here. +redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; # Redef'ed to F if logger-1 or logger-2 are active. redef Cluster::manager_is_logger = T; diff --git a/testing/btest/broker/remote_event.zeek b/testing/btest/broker/remote_event.zeek index de44ae87cd..5fd2acdf92 100644 --- a/testing/btest/broker/remote_event.zeek +++ b/testing/btest/broker/remote_event.zeek @@ -98,10 +98,4 @@ event ping(msg: string, n: count) local e = Broker::make_event(pong, msg, n); Broker::publish("zeek/event/my_topic", e); } - -event zeek_done() - { - print get_broker_stats(); - } - # @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_any.zeek b/testing/btest/broker/remote_event_any.zeek index 8bd37a36a5..dbc4d23989 100644 --- a/testing/btest/broker/remote_event_any.zeek +++ b/testing/btest/broker/remote_event_any.zeek @@ -106,10 +106,4 @@ event ping(msg: string, n: any) # internals should not wrap n into another Broker::Data record Broker::publish("zeek/event/my_topic", pong, msg, n); } - -event zeek_done() - { - print get_broker_stats(); - } - # @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_ssl_auth.zeek b/testing/btest/broker/remote_event_ssl_auth.zeek index cc4b052607..7c903ca856 100644 --- a/testing/btest/broker/remote_event_ssl_auth.zeek +++ b/testing/btest/broker/remote_event_ssl_auth.zeek @@ -235,10 +235,4 @@ event ping(msg: string, n: count) local e = Broker::make_event(pong, msg, n); Broker::publish("zeek/event/my_topic", e); } - -event zeek_done() - { - print get_broker_stats(); - } - # @TEST-END-FILE diff --git a/testing/btest/broker/remote_log.zeek b/testing/btest/broker/remote_log.zeek index 9a030b2d9e..79b74f4ef8 100644 --- a/testing/btest/broker/remote_log.zeek +++ b/testing/btest/broker/remote_log.zeek @@ -15,6 +15,9 @@ redef exit_only_after_terminate = T; +# Make the logging framework use broker! +redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; + module Test; export { diff --git a/testing/btest/broker/remote_log_batch.zeek b/testing/btest/broker/remote_log_batch.zeek index d0f3b44ce8..966cf14abc 100644 --- a/testing/btest/broker/remote_log_batch.zeek +++ b/testing/btest/broker/remote_log_batch.zeek @@ -15,6 +15,9 @@ redef exit_only_after_terminate = T; +# Make the logging framework use broker! +redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; + module Test; export { diff --git a/testing/btest/broker/remote_log_late_join.zeek b/testing/btest/broker/remote_log_late_join.zeek index bc5660f424..8a30569c7b 100644 --- a/testing/btest/broker/remote_log_late_join.zeek +++ b/testing/btest/broker/remote_log_late_join.zeek @@ -15,6 +15,9 @@ redef exit_only_after_terminate = T; +# Make the logging framework use broker! +redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; + module Test; export { diff --git a/testing/btest/broker/remote_log_types.zeek b/testing/btest/broker/remote_log_types.zeek index cb4e74251c..f55878d5ee 100644 --- a/testing/btest/broker/remote_log_types.zeek +++ b/testing/btest/broker/remote_log_types.zeek @@ -18,6 +18,9 @@ redef exit_only_after_terminate = T; +# Make the logging framework use broker! +redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; + global quit_receiver: event(); module Test; diff --git a/testing/btest/broker/telemetry.zeek b/testing/btest/broker/telemetry.zeek index 855b92509e..e504ca1b39 100644 --- a/testing/btest/broker/telemetry.zeek +++ b/testing/btest/broker/telemetry.zeek @@ -14,6 +14,7 @@ # @TEST-START-FILE common.zeek @load base/frameworks/cluster +@load base/frameworks/telemetry @load policy/frameworks/cluster/experimental redef exit_only_after_terminate = T;