btest: Use Broker for Broker specific tests

Now that Cluster::backend defaults to NONE by default, some tests won't
just work anymore for various reasons (mostly due to the logging
framework not sending log writes to broker anymore).

Load the new frameworks/cluster/backend/broker package for these to keep them
functional. Also add the @load to the common broker/cluster-layout.zeek file
to avoid changing all of the files that use that layout.

testing/btest/Files/broker/cluster-layout.zeek

@@ -19,6 +19,12 @@
 # to Cluster::nodes.
 
 
+# Using this testing cluster-layout.zeek switches Zeek to use Broker.
+#
+# This is side-loaded here to keep all existing tests that rely on
+# this Broker testing cluster setup to continue working.
+@load frameworks/cluster/backend/broker
+
 # Redef'ed to F if logger-1 or logger-2 are active.
 redef Cluster::manager_is_logger = T;
 

testing/btest/cluster/generic/cluster-publish-errors.zeek

@@ -1,7 +1,7 @@
 # @TEST-DOC: Test errors of cluster bifs
 #
 # @TEST-EXEC: zeek --parse-only -b %INPUT
-# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: zeek -b %INPUT frameworks/cluster/backend/broker
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stdout
 

testing/btest/cluster/websocket/terminate-while-queuing.zeek

@@ -19,6 +19,9 @@
 # @TEST-EXEC: btest-diff ./client/.stderr
 
 # @TEST-START-FILE manager.zeek
+
+@load frameworks/cluster/backend/broker
+
 redef exit_only_after_terminate = T;
 
 # Force dispatcher queue being full quickly!

testing/btest/core/suspend_processing/websocket.zeek

@@ -15,6 +15,8 @@
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff worker/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff client/.stdout
 
+@load frameworks/cluster/backend/broker
+
 global my_new_connection: event(uid: string, c: count);
 
 event zeek_init()

testing/btest/plugins/publish-event-hook.zeek

@@ -4,8 +4,9 @@
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b Demo::PublishEvent %INPUT > output
 # @TEST-EXEC: btest-diff output
 
-redef allow_network_time_forward = F;
+@load frameworks/cluster/backend/broker
 
+redef allow_network_time_forward = F;
 
 module App;
 

testing/btest/scripts/base/frameworks/control/configuration_update.zeek

@@ -5,6 +5,8 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff controllee/.stdout
 
+@load frameworks/cluster/backend/broker
+
 @load base/frameworks/control
 
 const test_var = "ORIGINAL VALUE (this should be printed out first)" &redef;

testing/btest/scripts/base/frameworks/control/id_value.zeek

@@ -9,6 +9,8 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff controller/.stdout
 
+@load frameworks/cluster/backend/broker
+
 @load base/frameworks/control
 
 # This value shouldn't ever be printed to the controllers stdout.

testing/btest/scripts/base/frameworks/control/shutdown.zeek

@@ -4,3 +4,5 @@
 # @TEST-EXEC: btest-bg-run controller ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=shutdown
 # @TEST-EXEC: btest-bg-wait 20
 
+@load frameworks/cluster/backend/broker
+

testing/btest/scripts/base/frameworks/logging/length-checking.zeek

@@ -17,6 +17,9 @@
 # @TEST-START-FILE common.zeek
 @load base/frameworks/notice/weird
 
+# Ensure logging is done via Broker
+@load frameworks/cluster/backend/broker
+
 module Test;
 
 # Disable the string and container length filtering.

testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_manager.zeek

@@ -12,6 +12,7 @@
 # @TEST-EXEC: btest-diff zeek/worker-1/stdout
 # @TEST-EXEC: btest-diff zeek/proxy-1/stdout
 
+@load frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 
 # So the supervised node doesn't terminate right away.

testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_worker.zeek

@@ -13,6 +13,7 @@
 # @TEST-EXEC: btest-diff zeek/worker-2/stdout
 # @TEST-EXEC: btest-diff zeek/proxy-1/stdout
 
+@load frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 
 # So the supervised node doesn't terminate right away.

testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek

@@ -55,6 +55,7 @@ for host in $(echo ${services_data} | jq -r '.[0].targets[]' | sort); do
 done
 # @TEST-END-FILE
 
+@load policy/frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 @load base/frameworks/telemetry
 

testing/btest/supervisor/config-cluster.zeek

@@ -11,6 +11,7 @@
 # @TEST-EXEC: btest-diff zeek/worker-1/stdout
 # @TEST-EXEC: btest-diff zeek/proxy-1/stdout
 
+@load policy/frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 
 # So the supervised node doesn't terminate right away.