From 12f3ab303b95a0a92a98b2e717ca0d2a5a6c0dc8 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 15 Jan 2019 10:30:06 -0600 Subject: [PATCH] Improve unit test for reporter shutdown order --- CHANGES | 4 ++++ VERSION | 2 +- .../btest/Baseline/core.reporter-shutdown-order-errors/out | 3 --- testing/btest/core/reporter-shutdown-order-errors.bro | 5 ++++- 4 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 testing/btest/Baseline/core.reporter-shutdown-order-errors/out diff --git a/CHANGES b/CHANGES index 279636f907..50d0e3da00 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-75 | 2019-01-15 10:30:06 -0600 + + * GH-213: change type of vector for-loop index to a count (Jon Siwek, Corelight) + 2.6-71 | 2019-01-14 16:11:58 -0600 * GH-205: prioritize use of sigaction() over sigset() (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 73adf66876..0e19640273 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-71 +2.6-75 diff --git a/testing/btest/Baseline/core.reporter-shutdown-order-errors/out b/testing/btest/Baseline/core.reporter-shutdown-order-errors/out deleted file mode 100644 index 81027ac39e..0000000000 --- a/testing/btest/Baseline/core.reporter-shutdown-order-errors/out +++ /dev/null @@ -1,3 +0,0 @@ -warning: ./config/Input::READER_CONFIG: Init: cannot open ./config -error: reporter/Log::WRITER_ASCII: cannot open reporter.log: Permission denied -error: reporter/Log::WRITER_ASCII: terminating thread diff --git a/testing/btest/core/reporter-shutdown-order-errors.bro b/testing/btest/core/reporter-shutdown-order-errors.bro index 8dbf386961..6289d47c96 100644 --- a/testing/btest/core/reporter-shutdown-order-errors.bro +++ b/testing/btest/core/reporter-shutdown-order-errors.bro @@ -1,6 +1,9 @@ # @TEST-EXEC: touch reporter.log && chmod -w reporter.log # @TEST-EXEC: bro %INPUT >out 2>&1 -# @TEST-EXEC: btest-diff out + +# Output doesn't really matter, but we just want to know that Bro shutdowns +# without crashing in such scenarios (reporter log not writable +# and also reporter errors being emitting during shutdown). redef Config::config_files += { "./config" };