From 700a9a4f37545a08f451ca12223f6913740bf56d Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 Sep 2022 18:32:13 +0200 Subject: [PATCH] Introduce basic test triggering when zeek -r triggers script errors I wonder if there's another one that covers errors during a basic zeek -r, but didn't seem like. --- .../Baseline/coverage.basic-no-errors/.stderr | 2 ++ .../Baseline/coverage.basic-no-errors/.stdout | 1 + .../Baseline/coverage.basic-no-errors/reporter.log | 11 +++++++++++ testing/btest/coverage/basic-no-errors.test | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 testing/btest/Baseline/coverage.basic-no-errors/.stderr create mode 100644 testing/btest/Baseline/coverage.basic-no-errors/.stdout create mode 100644 testing/btest/Baseline/coverage.basic-no-errors/reporter.log create mode 100644 testing/btest/coverage/basic-no-errors.test diff --git a/testing/btest/Baseline/coverage.basic-no-errors/.stderr b/testing/btest/Baseline/coverage.basic-no-errors/.stderr new file mode 100644 index 0000000000..ea6a1a2ba4 --- /dev/null +++ b/testing/btest/Baseline/coverage.basic-no-errors/.stderr @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +<...>/basic-no-errors.test, line 13: Hello, Zeek! diff --git a/testing/btest/Baseline/coverage.basic-no-errors/.stdout b/testing/btest/Baseline/coverage.basic-no-errors/.stdout new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/coverage.basic-no-errors/.stdout @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/coverage.basic-no-errors/reporter.log b/testing/btest/Baseline/coverage.basic-no-errors/reporter.log new file mode 100644 index 0000000000..ea0c54ad2e --- /dev/null +++ b/testing/btest/Baseline/coverage.basic-no-errors/reporter.log @@ -0,0 +1,11 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +#separator \x09 +#set_separator , +#empty_field (empty) +#unset_field - +#path reporter +#open XXXX-XX-XX-XX-XX-XX +#fields ts level message location +#types time enum string string +XXXXXXXXXX.XXXXXX Reporter::INFO Hello, Zeek! <...>/basic-no-errors.test, line 13 +#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/coverage/basic-no-errors.test b/testing/btest/coverage/basic-no-errors.test new file mode 100644 index 0000000000..d0c3bfda19 --- /dev/null +++ b/testing/btest/coverage/basic-no-errors.test @@ -0,0 +1,14 @@ +# @TEST-DOC: Running zeek -r in non-bare mode and ensure reporter errors happen. +# @TEST-EXEC: zeek -r $TRACES/http/get.trace %INPUT +# @TEST-EXEC: TEST_DIFF_CANONIFIER='$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-canonifier' btest-diff reporter.log +# @TEST-EXEC: btest-diff .stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr + +redef Reporter::info_to_stderr = T; +redef Reporter::errors_to_stderr = T; +redef Reporter::warnings_to_stderr = T; + +event zeek_init() + { + Reporter::info("Hello, Zeek!"); + }