testing/btest/*zeek: Comment all @TEST lines

This commit is contained in:
Arne Welzel 2025-04-17 15:32:11 +02:00
parent 2f0be32f5f
commit 85b8c8866b
311 changed files with 1272 additions and 1272 deletions

View file

@ -7,7 +7,7 @@
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# Used by all tests below.
# Debug printing
@ -51,7 +51,7 @@ event new_connection(c: connection)
local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value");
Log::write(LOG, info);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
# Delay and immediately release.
@ -66,7 +66,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay_finish(id, rec, token);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Delay and immediately release, twice.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -82,7 +82,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay_finish(id, rec, token2);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Delay once, never release.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -94,7 +94,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay(id, rec);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Delay twice, never release.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -107,7 +107,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay(id, rec);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Delay twice, never release, print the token value and its JSON representation.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{

View file

@ -7,7 +7,7 @@
# @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# Debug printing
global packet_count = 0;
event new_packet(c: connection, p: pkt_hdr)
@ -42,7 +42,7 @@ event zeek_init()
{
Log::create_stream(LOG, [$columns=Info, $path="test", $policy=log_policy]);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{

View file

@ -9,7 +9,7 @@
redef Log::default_max_delay_interval = 50msec;
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
global packet_count = 0;
event new_packet(c: connection, p: pkt_hdr)
@ -51,7 +51,7 @@ event new_connection(c: connection)
local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value");
Log::write(LOG, info);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
# Delay the given record twice using a nested lambda.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
@ -86,7 +86,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Delay the given record twice using a nested lambda, but also immediate release.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{

View file

@ -10,7 +10,7 @@
# @TEST-EXEC: touch test.log && zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
global packet_count = 0;
event new_packet(c: connection, p: pkt_hdr)
@ -52,7 +52,7 @@ event new_connection(c: connection)
local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value");
Log::write(LOG, info);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
# Basic delay() test, no delay_finish()
hook Log::log_stream_policy(rec: Info, id: Log::ID)
@ -80,7 +80,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Basic delay() test with delay_finish(), expect callback to be invoked
# right at Log::delay_finish()
hook Log::log_stream_policy(rec: Info, id: Log::ID)
@ -109,7 +109,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Basic delay() test with two callbacks but just one Log::delay_finish() call.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -142,7 +142,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Basic delay() test two callbacks and two Log::delay_finish() calls.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -176,7 +176,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# The delay callback suppresses the log by return F.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -203,7 +203,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Do a delay and immediate release with a callback.
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{

View file

@ -18,7 +18,7 @@ event zeek_init()
Log::delay_finish(LOG, rec, token);
}
@TEST-START-NEXT
# @TEST-START-NEXT
@load base/protocols/conn
hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
@ -27,7 +27,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
Log::delay(id, copy(rec));
}
@TEST-START-NEXT
# @TEST-START-NEXT
@load base/protocols/conn
@load base/protocols/dns
@ -37,7 +37,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
Log::delay(DNS::LOG, rec);
}
@TEST-START-NEXT
# @TEST-START-NEXT
@load base/protocols/conn
hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
@ -47,7 +47,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
Log::delay_finish(id, copy(rec), token);
}
@TEST-START-NEXT
# @TEST-START-NEXT
@load base/protocols/conn
hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
@ -58,7 +58,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
Log::delay_finish(id, rec, token);
}
@TEST-START-NEXT
# @TEST-START-NEXT
@load base/protocols/conn
hook Conn::log_policy(rec: Conn::Info, id: Log::ID, filter: Log::Filter)

View file

@ -7,7 +7,7 @@
# @TEST-EXEC: touch test.log && zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
global packet_count = 0;
event new_packet(c: connection, p: pkt_hdr)
@ -42,7 +42,7 @@ event zeek_init()
{
Log::create_stream(LOG, [$columns=Info, $path="test", $policy=log_policy]);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
event new_connection(c: connection)
{

View file

@ -10,7 +10,7 @@
# @TEST-EXEC: touch test-other.log && zeek-cut -m -F'|' < test-other.log > test-other.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test-other.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# Debug printing
global packet_count = 0;
@ -55,7 +55,7 @@ event new_connection(c: connection)
local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value");
Log::write(LOG, info);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
@ -84,7 +84,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
}
@TEST-START-NEXT
# @TEST-START-NEXT
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
local now = network_time();

View file

@ -7,7 +7,7 @@
# @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# Used by all tests below.
# Debug printing
@ -44,7 +44,7 @@ event Pcap::file_done(p: string)
print network_time(), "Pcap::file_done", p;
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
# Delay records for a long time, reduce queue size after 10 packets to 3.
event zeek_init()
@ -84,7 +84,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
#
# Delay records for a long time, reduce queue size after 10 packets to 3,
# re-delay all records once, provoking failure to free any space in the

View file

@ -7,7 +7,7 @@
# @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# Used by all tests below.
# Debug printing
@ -45,7 +45,7 @@ event Pcap::file_done(p: string)
print network_time(), "Pcap::file_done", p;
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
event zeek_init()
{

View file

@ -7,7 +7,7 @@
# @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# Used by all tests below.
# Debug printing
@ -44,7 +44,7 @@ event Pcap::file_done(p: string)
print network_time(), "Pcap::file_done", p;
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
# Delay every record by 1msec.
event zeek_init()
@ -75,7 +75,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
#
# Delay every record, but call Log::delay_finish() immediately afterwards
# through an event.
@ -114,7 +114,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
event release_delay(rec, token);
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
#
# Delay every record, and for every other record call Log::delay_finish()
# immediately afterwards via an event.
@ -159,7 +159,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Delay every entry by 10 seconds, but set queue size to 5 such that
# entries are evicted when the queue size is reached.
@ -193,7 +193,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Re-delaying works even if that results in more forceful expiration.
redef record Info += {
@ -239,7 +239,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay(id, rec, post_delay_cb);
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Re-delay once after the delay expired.
redef record Info += {
@ -284,7 +284,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay(id, rec, post_delay_cb);
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
# Re-delay once after Log::delay_finish()
redef record Info += {

View file

@ -17,7 +17,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
}
# @TEST-START-NEXT
# # @TEST-START-NEXT
@load base/protocols/conn
# PostDelayCallback needs to return a bool
@ -32,7 +32,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
Log::delay(id, rec, post_delay_cb);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Bad token type 1
@load base/protocols/conn
@ -43,7 +43,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
Log::delay_finish(id, rec, "42");
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Bad token type 2
@load base/protocols/conn

View file

@ -8,12 +8,12 @@
# @TEST-EXEC: grep qux manager-1/reporter-2.log | sed 's#line ..*#line XX#g' >> manager-reporter.log
# @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-canonifier | $SCRIPTS/diff-remove-abspath | grep -v ^# | $SCRIPTS/diff-sort" btest-diff manager-reporter.log
@TEST-START-FILE cluster-layout.zeek
# @TEST-START-FILE cluster-layout.zeek
redef Cluster::nodes = {
["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
};
@TEST-END-FILE
# @TEST-END-FILE
@load base/frameworks/cluster
@load base/frameworks/logging

View file

@ -7,12 +7,12 @@
# @TEST-EXEC: btest-diff manager-1/http.log
@TEST-START-FILE cluster-layout.zeek
# @TEST-START-FILE cluster-layout.zeek
redef Cluster::nodes = {
["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
};
@TEST-END-FILE
# @TEST-END-FILE
@load base/protocols/conn
@load base/protocols/http

View file

@ -5,7 +5,7 @@
# @TEST-EXEC: if test -f other.log; then btest-diff other.log; fi
# @TEST-EXEC: if test -f output; then btest-diff output; fi
@TEST-START-FILE test.zeek
# @TEST-START-FILE test.zeek
# This provides a simple test module harness, used by all of the individual tests below.
module Test;
@ -28,7 +28,7 @@ event zeek_init() &priority=2
Log::create_stream(Test::LOG, [$columns=Info, $path="test", $policy=log_policy]);
Log::create_stream(Test::LOG_OTHER, [$columns=Info, $path="test_other"]);
}
@TEST-END-FILE test.zeek
# @TEST-END-FILE test.zeek
# Verify basic argument passing -- id and filter should be accessible
# and have expected values. The hook should not catch.
@ -44,7 +44,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="foo"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that a policy hook can veto select log records.
@ -60,7 +60,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="bar"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that a policy hook can alter the log entry.
#
@ -79,7 +79,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="foo"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that multiple hook handlers can get registered and their
# priorities work as expected. (More of a generic hook test than
@ -104,7 +104,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="foo"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that the stream-level policy gets inherited into additional
# filters. The single hook handler should get invoked for both of the
@ -124,7 +124,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="foo"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that filters can override the stream-level policy. The
# stream-level policy rejects select records; the overriding one is
@ -147,7 +147,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="bar"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that filters can define their own policy hooks when the
# stream doesn't provide any. The Test::LOG_OTHER stream does not.
@ -169,7 +169,7 @@ event zeek_init()
Log::write(Test::LOG_OTHER, [$t=network_time(), $status="bar"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that the global policy hook is effective. We have no
# filter-specific hook handlers, only the global one is vetoing
@ -192,7 +192,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="bar"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify the combination of global and filter-specific policy hooks.
# The former get invoked first.
@ -226,7 +226,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="bar"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify that per write, the global hook gets invoked once and the
# filter-level hooks once per filter, that filter hooks get
@ -263,7 +263,7 @@ event zeek_init()
Log::write(Test::LOG, [$t=network_time(), $status="bar"]);
}
@TEST-START-NEXT
# @TEST-START-NEXT
# Verify the global policy works on streams with no per-filter hooks, since
# their logic is a bit intertwined.

View file

@ -10,7 +10,7 @@
# Testing all possible types.
#
@TEST-START-FILE ssh.sql
# @TEST-START-FILE ssh.sql
PRAGMA foreign_keys=OFF;
BEGIN TRANSACTION;
CREATE TABLE ssh (
@ -33,7 +33,7 @@ CREATE TABLE ssh (
);
INSERT INTO "ssh" VALUES(1,-42,'SSH::LOG',21,123,'10.0.0.0/24','1.2.3.4',3.14,1.36859359634203600879e+09,100.0,'hurz','2,4,1,3','CC,AA,BB','(empty)','10,20,30','(empty)');
COMMIT;
@TEST-END-FILE
# @TEST-END-FILE