Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 19:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Try to fix a rare broker test instability

Browse source
This commit is contained in:
Jon Siwek 2018-09-10 19:47:03 -05:00
parent c89c09fda3
commit 13483e4892
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.5-994 | 2018-09-10 19:47:03 -0500
* Try to fix a rare broker test instability (Jon Siwek, Corelight)
* Fix invalid memory free when using Log::default_field_name_map (Jon Siwek, Corelight)
2.5-992 | 2018-09-10 18:34:09 -0500 2.5-992 | 2018-09-10 18:34:09 -0500
* Stabilize a unit test. (Jon Siwek, Corelight) * Stabilize a unit test. (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.5-992 2.5-994

12
testing/btest/broker/disconnect.bro
View file

@ -3,10 +3,7 @@
# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" # @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out"
# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" # @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out"
# @TEST-EXEC: $SCRIPTS/wait-for-file recv/got-event 30 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat recv/.pid) 30 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: kill $(cat recv/.pid)
# @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat recv/.pid) 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: echo 0 >recv/.exitcode
# @TEST-EXEC: btest-bg-run recv2 "bro -B broker -b ../recv.bro >recv2.out" # @TEST-EXEC: btest-bg-run recv2 "bro -B broker -b ../recv.bro >recv2.out"
# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-bg-wait 30
@ -60,12 +57,7 @@ const test_topic = "bro/test/my_topic";
event my_event(i: count) event my_event(i: count)
{ {
print "receiver got event", i; print "receiver got event", i;
terminate();
if ( i == 1 )
# In the first case, terminate via `kill` from btest command.
system("touch got-event");
else
terminate();
} }
event bro_init() event bro_init()