From 48b26f74f7f69246fc00693adad622fd1606e493 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 13 Dec 2024 18:25:28 +0100 Subject: [PATCH 1/3] btest/validate-ZAM: Update baseline, run always --- .../btest/{Baseline.zam => Baseline}/opt.validate-ZAM/output | 2 +- testing/btest/opt/validate-ZAM.zeek | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename testing/btest/{Baseline.zam => Baseline}/opt.validate-ZAM/output (75%) diff --git a/testing/btest/Baseline.zam/opt.validate-ZAM/output b/testing/btest/Baseline/opt.validate-ZAM/output similarity index 75% rename from testing/btest/Baseline.zam/opt.validate-ZAM/output rename to testing/btest/Baseline/opt.validate-ZAM/output index ab1e22adfe..2f91ef7f21 100644 --- a/testing/btest/Baseline.zam/opt.validate-ZAM/output +++ b/testing/btest/Baseline/opt.validate-ZAM/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -1248 valid, 1892 tested, 437 skipped +1248 valid, 1890 tested, 437 skipped diff --git a/testing/btest/opt/validate-ZAM.zeek b/testing/btest/opt/validate-ZAM.zeek index d2798b1d8d..0206d5a7a0 100644 --- a/testing/btest/opt/validate-ZAM.zeek +++ b/testing/btest/opt/validate-ZAM.zeek @@ -1,5 +1,4 @@ # @TEST-DOC: ZAM maintenance script for validating synthesized operations. -# @TEST-REQUIRES: test "${ZEEK_ZAM}" = "1" # # @TEST-EXEC: zeek -b -O validate-ZAM %INPUT >output # @TEST-EXEC: btest-diff output From 21e33fdcd9a8a33f61513e9177bd357cee4cec44 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 13 Dec 2024 18:28:42 +0100 Subject: [PATCH 2/3] btest/cluster: Bump timeouts to 30 seconds ZAM startup may take a long time, particularly in CI environments, so bump it up from 10 to 30 seconds. --- testing/btest/cluster/broker/publish-any.zeek | 2 +- testing/btest/cluster/generic/logging-rr.zeek | 2 +- testing/btest/cluster/generic/publish-any.zeek | 2 +- testing/btest/cluster/generic/publish-hrw.zeek | 2 +- testing/btest/cluster/generic/publish-rr.zeek | 2 +- testing/btest/cluster/zeromq/logging.zeek | 2 +- testing/btest/cluster/zeromq/manager-is-logger.zeek | 2 +- testing/btest/cluster/zeromq/supervisor.zeek | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testing/btest/cluster/broker/publish-any.zeek b/testing/btest/cluster/broker/publish-any.zeek index 09497c7bae..6f113bb957 100644 --- a/testing/btest/cluster/broker/publish-any.zeek +++ b/testing/btest/cluster/broker/publish-any.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../worker.zeek" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff ./manager/.stdout # @TEST-EXEC: btest-diff ./worker-1/.stdout diff --git a/testing/btest/cluster/generic/logging-rr.zeek b/testing/btest/cluster/generic/logging-rr.zeek index 7ff18c18c4..5ce5279367 100644 --- a/testing/btest/cluster/generic/logging-rr.zeek +++ b/testing/btest/cluster/generic/logging-rr.zeek @@ -20,7 +20,7 @@ # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../worker.zeek >out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-2 zeek -b ../worker.zeek >out" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # # @TEST-EXEC: test $(grep -c worker-1 logger-1/rr2.log) -gt 10 # @TEST-EXEC: test $(grep -c worker-2 logger-1/rr2.log) -gt 10 diff --git a/testing/btest/cluster/generic/publish-any.zeek b/testing/btest/cluster/generic/publish-any.zeek index 9b68f6abab..2078019f17 100644 --- a/testing/btest/cluster/generic/publish-any.zeek +++ b/testing/btest/cluster/generic/publish-any.zeek @@ -14,7 +14,7 @@ # @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../worker.zeek" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff ./manager/.stdout # @TEST-EXEC: btest-diff ./worker-1/.stdout diff --git a/testing/btest/cluster/generic/publish-hrw.zeek b/testing/btest/cluster/generic/publish-hrw.zeek index 7e12e3f71f..30de3c191c 100644 --- a/testing/btest/cluster/generic/publish-hrw.zeek +++ b/testing/btest/cluster/generic/publish-hrw.zeek @@ -15,7 +15,7 @@ # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../worker.zeek >out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-2 zeek -b ../worker.zeek >out" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: sort < ./manager/out > ./manager.sorted # @TEST-EXEC: sort < ./worker-1/out > ./worker-1.sorted # @TEST-EXEC: sort < ./worker-2/out > ./worker-2.sorted diff --git a/testing/btest/cluster/generic/publish-rr.zeek b/testing/btest/cluster/generic/publish-rr.zeek index c74fef4052..87c7565696 100644 --- a/testing/btest/cluster/generic/publish-rr.zeek +++ b/testing/btest/cluster/generic/publish-rr.zeek @@ -15,7 +15,7 @@ # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../worker.zeek >out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-2 zeek -b ../worker.zeek >out" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: sort < ./manager/out > ./manager.sorted # @TEST-EXEC: sort < ./worker-1/out > ./worker-1.sorted # @TEST-EXEC: sort < ./worker-2/out > ./worker-2.sorted diff --git a/testing/btest/cluster/zeromq/logging.zeek b/testing/btest/cluster/zeromq/logging.zeek index 377cf5da90..8116739329 100644 --- a/testing/btest/cluster/zeromq/logging.zeek +++ b/testing/btest/cluster/zeromq/logging.zeek @@ -19,7 +19,7 @@ # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../other.zeek >out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-2 zeek -b ../other.zeek >out" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff cluster.log.normalized # @TEST-EXEC: zeek-cut -F ' ' < ./logger/node_up.log | sort > node_up.sorted # @TEST-EXEC: btest-diff node_up.sorted diff --git a/testing/btest/cluster/zeromq/manager-is-logger.zeek b/testing/btest/cluster/zeromq/manager-is-logger.zeek index c01a1e8f73..1ed3652d7c 100644 --- a/testing/btest/cluster/zeromq/manager-is-logger.zeek +++ b/testing/btest/cluster/zeromq/manager-is-logger.zeek @@ -18,7 +18,7 @@ # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../other.zeek >out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-2 zeek -b ../other.zeek >out" # -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff cluster.log.normalized # @TEST-EXEC: zeek-cut -F ' ' < ./manager/node_up.log | sort > node_up.sorted # @TEST-EXEC: btest-diff node_up.sorted diff --git a/testing/btest/cluster/zeromq/supervisor.zeek b/testing/btest/cluster/zeromq/supervisor.zeek index 62574e9867..11b19bae51 100644 --- a/testing/btest/cluster/zeromq/supervisor.zeek +++ b/testing/btest/cluster/zeromq/supervisor.zeek @@ -13,7 +13,7 @@ # @TEST-EXEC: cp $FILES/zeromq/test-bootstrap.zeek zeromq-test-bootstrap.zeek # # @TEST-EXEC: btest-bg-run supervisor "ZEEKPATH=$ZEEKPATH:.. && zeek -j ../supervisor.zeek >out" -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff supervisor/cluster.log redef Log::default_rotation_interval = 0secs; From a675aea6bb84500ac52c6053078298e699b7e41d Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 13 Dec 2024 18:35:39 +0100 Subject: [PATCH 3/3] btest/supervisor: Bump one timeout to 30 seconds --- testing/btest/supervisor/config-cluster-multi-logger.zeek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/btest/supervisor/config-cluster-multi-logger.zeek b/testing/btest/supervisor/config-cluster-multi-logger.zeek index 51a7cfb229..d0e7def7a4 100644 --- a/testing/btest/supervisor/config-cluster-multi-logger.zeek +++ b/testing/btest/supervisor/config-cluster-multi-logger.zeek @@ -7,7 +7,7 @@ # contain their node names as log_suffix metadata within the log-queue directory. # # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT -# @TEST-EXEC: btest-bg-wait 10 +# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: ls zeek/log-queue/test*logger-1__.log >> logs.out # @TEST-EXEC: ls zeek/log-queue/test*logger-2__.log >> logs.out # @TEST-EXEC: TEST_DIFF_CANONIFIER='sed "s/[0-9][0-9]/XX/g"' btest-diff logs.out