Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/awelzel/double-commented-btest-lines'

Browse source 
* origin/topic/awelzel/double-commented-btest-lines:
  testing/btest: Fix double commented @TEST- lines
This commit is contained in:
Arne Welzel 2025-05-06 14:20:54 +02:00
commit 3be7a9ce91
23 changed files with 61 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
8.0.0-dev.46 | 2025-05-06 14:20:54 +0200
* testing/btest: Fix double commented @TEST- lines (Arne Welzel, Corelight)
sed -i 's/^# # @/# @/g'
8.0.0-dev.44 | 2025-05-06 14:20:22 +0200 8.0.0-dev.44 | 2025-05-06 14:20:22 +0200
* GH-4420: Websocket: Close onloop during Terminate() (Arne Welzel, Corelight) * GH-4420: Websocket: Close onloop during Terminate() (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.44 8.0.0-dev.46

12
testing/btest/cluster/broker/publish-any.zeek
View file

@ -19,15 +19,15 @@ redef Cluster::nodes = {
}; };
# @TEST-END-FILE # @TEST-END-FILE
# # @TEST-START-FILE common.zeek # @TEST-START-FILE common.zeek
redef Log::default_rotation_interval = 0sec; redef Log::default_rotation_interval = 0sec;
global finish: event() &is_used; global finish: event() &is_used;
global ping: event(c: count, what: string, val: any) &is_used; global ping: event(c: count, what: string, val: any) &is_used;
global pong: event(c: count, what: string, val: any) &is_used; global pong: event(c: count, what: string, val: any) &is_used;
# # @TEST-END-FILE # @TEST-END-FILE
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./common.zeek @load ./common.zeek
global i = 0; global i = 0;
@ -86,10 +86,10 @@ event Cluster::node_down(name: string, id: string)
{ {
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# # @TEST-START-FILE worker.zeek # @TEST-START-FILE worker.zeek
@load ./common.zeek @load ./common.zeek
event ping(c: count, what: string, val: any) event ping(c: count, what: string, val: any)
@ -109,4 +109,4 @@ event finish()
print "got finish!"; print "got finish!";
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE

12
testing/btest/cluster/generic/logging-rr.zeek
View file

@ -32,7 +32,7 @@
# @TEST-EXEC: sort -n rr2.log > rr2.log.sorted # @TEST-EXEC: sort -n rr2.log > rr2.log.sorted
# @TEST-EXEC: btest-diff rr2.log.sorted # @TEST-EXEC: btest-diff rr2.log.sorted
# # @TEST-START-FILE common.zeek # @TEST-START-FILE common.zeek
@load ./zeromq-test-bootstrap.zeek @load ./zeromq-test-bootstrap.zeek
redef Log::default_rotation_interval = 0sec; redef Log::default_rotation_interval = 0sec;
@ -62,9 +62,9 @@ event finish()
{ {
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./common.zeek @load ./common.zeek
event check_ready() event check_ready()
@ -103,10 +103,10 @@ event Cluster::node_down(name: string, id: string)
if ( |nodes_down| == 4 ) # both loggers down if ( |nodes_down| == 4 ) # both loggers down
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# # @TEST-START-FILE worker.zeek # @TEST-START-FILE worker.zeek
@load ./common.zeek @load ./common.zeek
global do_write2 = F; global do_write2 = F;
@ -147,7 +147,7 @@ event zeek_init()
event write_log1(0); event write_log1(0);
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE check-log.sh # @TEST-START-FILE check-log.sh
#!/usr/bin/env bash #!/usr/bin/env bash

4
testing/btest/cluster/websocket/bad-event-args.zeek
View file

@ -25,7 +25,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -55,7 +55,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
print "Cluster::websocket_client_lost"; print "Cluster::websocket_client_lost";
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/bad-subscriptions.zeek
View file

@ -25,7 +25,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -54,7 +54,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
if ( lost == 4 ) if ( lost == 4 )
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/bad-url.zeek
View file

@ -25,7 +25,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -58,7 +58,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
print "Cluster::websocket_client_lost"; print "Cluster::websocket_client_lost";
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/cluster-log.zeek
View file

@ -27,7 +27,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -70,7 +70,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
if ( lost == 3 ) if ( lost == 3 )
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/one-pipelining.zeek
View file

@ -25,7 +25,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -58,7 +58,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
print "Cluster::websocket_client_lost"; print "Cluster::websocket_client_lost";
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/one.zeek
View file

@ -25,7 +25,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -58,7 +58,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
print "Cluster::websocket_client_lost"; print "Cluster::websocket_client_lost";
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/three.zeek
View file

@ -26,7 +26,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -74,7 +74,7 @@ event zeek_init()
Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]); Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]);
Cluster::subscribe("/test/manager"); Cluster::subscribe("/test/manager");
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/tls.zeek
View file

@ -27,7 +27,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -72,7 +72,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
print "Cluster::websocket_client_lost"; print "Cluster::websocket_client_lost";
terminate(); terminate();
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

4
testing/btest/cluster/websocket/two-pipelining.zeek
View file

@ -26,7 +26,7 @@
# @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/out
# @TEST-EXEC: btest-diff ./client/.stderr # @TEST-EXEC: btest-diff ./client/.stderr
# # @TEST-START-FILE manager.zeek # @TEST-START-FILE manager.zeek
@load ./zeromq-test-bootstrap @load ./zeromq-test-bootstrap
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -106,7 +106,7 @@ event zeek_init()
Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]); Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]);
Cluster::subscribe("/test/manager"); Cluster::subscribe("/test/manager");
} }
# # @TEST-END-FILE # @TEST-END-FILE
# @TEST-START-FILE client.py # @TEST-START-FILE client.py

2
testing/btest/core/record-field-redef-errors.zeek
View file

@ -45,7 +45,7 @@ redef record M::Info$no_such_field -= { &log };
# This isn't reported very nicely: It's a syntax error rather than an unknown attribute # This isn't reported very nicely: It's a syntax error rather than an unknown attribute
redef record M::Info$ts += { &unknown }; redef record M::Info$ts += { &unknown };
# # @TEST-START-FILE setup.zeek # @TEST-START-FILE setup.zeek
module M; module M;
export { export {
type ErrCode: enum { type ErrCode: enum {

4
testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek
View file

@ -27,7 +27,7 @@ hook X509::x509_certificate_cache_replay(f: fa_file, e: X509::Info, sha256: stri
# First: Plain, no changes - certificate event caching won't even engage. # First: Plain, no changes - certificate event caching won't even engage.
# # @TEST-START-NEXT # @TEST-START-NEXT
# Second - engage certificate caching. # Second - engage certificate caching.
# Log files and events are unchanged - but the replay hook engages # Log files and events are unchanged - but the replay hook engages
@ -35,7 +35,7 @@ hook X509::x509_certificate_cache_replay(f: fa_file, e: X509::Info, sha256: stri
redef X509::caching_required_encounters = 1; redef X509::caching_required_encounters = 1;
redef X509::certificate_cache_minimum_eviction_interval = 11min; redef X509::certificate_cache_minimum_eviction_interval = 11min;
# # @TEST-START-NEXT # @TEST-START-NEXT
# Third - load policy script to not raise events # Third - load policy script to not raise events
# Log files are unchanged; events are not raised from the third time. # Log files are unchanged; events are not raised from the third time.

4
testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
View file

@ -28,7 +28,7 @@ event zeek_init()
$destination=destination, $want_record=F]); $destination=destination, $want_record=F]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test, but using event streams for input. # The same test, but using event streams for input.
@ -41,7 +41,7 @@ event zeek_init()
$fields=Val, $ev=inputev]); $fields=Val, $ev=inputev]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test again, but using file analysis w/ binary readers. # The same test again, but using file analysis w/ binary readers.

4
testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
View file

@ -22,7 +22,7 @@ event zeek_init()
$destination=destination, $want_record=F]); $destination=destination, $want_record=F]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test, but using event streams for input. # The same test, but using event streams for input.
@ -35,7 +35,7 @@ event zeek_init()
$fields=Val, $ev=inputev]); $fields=Val, $ev=inputev]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test again, but using file analysis w/ binary readers. # The same test again, but using file analysis w/ binary readers.

4
testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
View file

@ -19,7 +19,7 @@ event zeek_init()
$destination=destination, $want_record=F]); $destination=destination, $want_record=F]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test, but using event streams for input. # The same test, but using event streams for input.
@ -31,7 +31,7 @@ event zeek_init()
$fields=Val, $ev=inputev]); $fields=Val, $ev=inputev]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test again, but using file analysis w/ binary readers. # The same test again, but using file analysis w/ binary readers.

4
testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
View file

@ -22,7 +22,7 @@ event zeek_init()
$destination=destination, $want_record=F]); $destination=destination, $want_record=F]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test, but using event streams for input. # The same test, but using event streams for input.
@ -35,7 +35,7 @@ event zeek_init()
$fields=Val, $ev=inputev]); $fields=Val, $ev=inputev]);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# The same test again, but using file analysis w/ binary readers. # The same test again, but using file analysis w/ binary readers.

10
testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek
View file

@ -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 # Basic delay() test with delay_finish(), expect callback to be invoked
# right at Log::delay_finish() # right at Log::delay_finish()
hook Log::log_stream_policy(rec: Info, id: Log::ID) 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. # Basic delay() test with two callbacks but just one Log::delay_finish() call.
hook Log::log_stream_policy(rec: Info, id: Log::ID) 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. # Basic delay() test two callbacks and two Log::delay_finish() calls.
hook Log::log_stream_policy(rec: Info, id: Log::ID) 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. # The delay callback suppresses the log by return F.
hook Log::log_stream_policy(rec: Info, id: Log::ID) 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. # Do a delay and immediate release with a callback.
hook Log::log_stream_policy(rec: Info, id: Log::ID) hook Log::log_stream_policy(rec: Info, id: Log::ID)
{ {

2
testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek
View file

@ -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, # 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 # re-delay all records once, provoking failure to free any space in the

12
testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek
View file

@ -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 # Delay every record, but call Log::delay_finish() immediately afterwards
# through an event. # through an event.
@ -114,7 +114,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
event release_delay(rec, token); event release_delay(rec, token);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# #
# Delay every record, and for every other record call Log::delay_finish() # Delay every record, and for every other record call Log::delay_finish()
# immediately afterwards via an event. # 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 # Delay every entry by 10 seconds, but set queue size to 5 such that
# entries are evicted when the queue size is reached. # 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. # Re-delaying works even if that results in more forceful expiration.
redef record Info += { redef record Info += {
@ -239,7 +239,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay(id, rec, post_delay_cb); Log::delay(id, rec, post_delay_cb);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# Re-delay once after the delay expired. # Re-delay once after the delay expired.
redef record Info += { redef record Info += {
@ -284,7 +284,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
Log::delay(id, rec, post_delay_cb); Log::delay(id, rec, post_delay_cb);
} }
# # @TEST-START-NEXT # @TEST-START-NEXT
# Re-delay once after Log::delay_finish() # Re-delay once after Log::delay_finish()
redef record Info += { redef record Info += {

2
testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek
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 @load base/protocols/conn
# PostDelayCallback needs to return a bool # PostDelayCallback needs to return a bool