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

Fix input error test nondeterminism

Browse source 
It seems like other similar tests get by because they have more "stuff"
before they call `terminate()` most likely. But, to be safe, just
removing the "received termination signal" line seems like the best
approach.
This commit is contained in:
Evan Typanski 2024-10-02 13:26:41 -04:00
parent 6aeb302bfc
commit e8872b4c7f
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
testing/btest/Baseline/scripts.base.frameworks.input.invalid-lines-duplicate/.stderrwithoutfirstline
View file

@ -3,5 +3,4 @@ warning: ..<...>/Input::READER_ASCII: ../input.log, line 3: Not enough fields in
warning: ..<...>/Input::READER_ASCII: ../input.log, line 9: Suppressed 5 warning(s) warning: ..<...>/Input::READER_ASCII: ../input.log, line 9: Suppressed 5 warning(s)
warning: ..<...>/Input::READER_ASCII: ../input.log, line 10: Not enough fields in line 'hello' of ../input.log. Found 0 fields, want positions 1 and -1 warning: ..<...>/Input::READER_ASCII: ../input.log, line 10: Not enough fields in line 'hello' of ../input.log. Found 0 fields, want positions 1 and -1
warning: ..<...>/Input::READER_ASCII: ../input.log, line 16: Suppressed 6 warning(s) warning: ..<...>/Input::READER_ASCII: ../input.log, line 16: Suppressed 6 warning(s)
received termination signal
>>> >>>

4
testing/btest/scripts/base/frameworks/input/invalid-lines-duplicate.zeek
View file

@ -1,6 +1,6 @@
# @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-bg-wait 10
# @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: sed -e 1d -e '/received termination/d' .stderr > .stderrwithoutfirstline
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
@ -46,5 +46,5 @@ event zeek_init() {
event Input::end_of_data(name: string, source:string) { event Input::end_of_data(name: string, source:string) {
terminate(); terminate();
} }