From a2bcb1bf285d694c1c035d64f7b9a4252fff684a Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 6 Jul 2022 22:52:48 +0200 Subject: [PATCH] sqlite default-logdir test: Remove ls ./logs baseline Observed .sqlite-journal files and missing reporter.sqlite files in CI runs. Subsequently reading the ./test.sqlite file is more reliable and should be good enough. --- .../ls.logs | 3 --- .../scripts/base/frameworks/logging/sqlite/default-logdir.zeek | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 testing/btest/Baseline/scripts.base.frameworks.logging.sqlite.default-logdir/ls.logs diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.sqlite.default-logdir/ls.logs b/testing/btest/Baseline/scripts.base.frameworks.logging.sqlite.default-logdir/ls.logs deleted file mode 100644 index d31d0d2566..0000000000 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.sqlite.default-logdir/ls.logs +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -./logs/reporter.sqlite -./logs/test.sqlite diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/default-logdir.zeek b/testing/btest/scripts/base/frameworks/logging/sqlite/default-logdir.zeek index 0dd5023ce8..127943fb6a 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/default-logdir.zeek +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/default-logdir.zeek @@ -5,10 +5,8 @@ # # @TEST-EXEC: mkdir logs # @TEST-EXEC: zeek -b -r ${TRACES}/rotation.trace %INPUT >zeek.out 2>&1 -# @TEST-EXEC: ls ./logs/* > ls.logs # @TEST-EXEC: sqlite3 ./logs/test.sqlite 'select * from test' > test.select # @TEST-EXEC: btest-diff test.select -# @TEST-EXEC: btest-diff ls.logs # @TEST-EXEC: btest-diff zeek.out # # @TEST-DOC: Configure Log::default_writer, Log::default_logdir and ensure the test.sqlite database is in ./logs