Merge remote-tracking branch 'origin/topic/vern/ZAM-assert-streamlining'

* origin/topic/vern/ZAM-assert-streamlining:
  btest/supervisor: Bump one timeout to 30 seconds
  btest/cluster: Bump timeouts to 30 seconds
  btest/validate-ZAM: Update baseline, run always

CHANGES

@@ -1,3 +1,14 @@
+7.1.0-dev.827 | 2024-12-13 12:17:25 -0700
+
+  * btest/supervisor: Bump one timeout to 30 seconds (Arne Welzel, Corelight)
+
+  * btest/cluster: Bump timeouts to 30 seconds (Arne Welzel, Corelight)
+
+    ZAM startup may take a long time, particularly in CI environments, so
+    bump it up from 10 to 30 seconds.
+
+  * btest/validate-ZAM: Update baseline, run always (Arne Welzel, Corelight)
+
 7.1.0-dev.823 | 2024-12-13 12:14:46 -0700
 
   * simplified ZAM instructions for executing "assert" statements (Vern Paxson, Corelight)

VERSION

@@ -1 +1 @@
-7.1.0-dev.823
+7.1.0-dev.827

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

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
 

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

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
 

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

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

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

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

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;

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

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