From fd191fd9b67794d72ec9c28de9c366d81d29629f Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Mon, 3 Feb 2025 12:19:12 +0200 Subject: Use logger ctor in all tests --- log_db/src/lib.rs | 7 +++++++ log_db/src/log_reader_forward.rs | 9 ++++++++- log_db/tests/integration.rs | 4 ---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/log_db/src/lib.rs b/log_db/src/lib.rs index 67a1e0b..5110aea 100644 --- a/log_db/src/lib.rs +++ b/log_db/src/lib.rs @@ -231,10 +231,17 @@ impl DB { #[cfg(test)] mod tests { + use ctor::ctor; + use env_logger; use std::collections::HashSet; use super::*; + #[ctor] + fn init_logger() { + let _ = env_logger::builder().is_test(true).try_init(); + } + #[derive(Eq, PartialEq, Clone, Debug)] enum Field { Id, diff --git a/log_db/src/log_reader_forward.rs b/log_db/src/log_reader_forward.rs index a1979b3..66b0b47 100644 --- a/log_db/src/log_reader_forward.rs +++ b/log_db/src/log_reader_forward.rs @@ -92,13 +92,20 @@ impl Iterator for ForwardLogReader { #[cfg(test)] mod tests { + use ctor::ctor; + use env_logger; + use super::*; + #[ctor] + fn init_logger() { + let _ = env_logger::builder().is_test(true).try_init(); + } + const TEST_RESOURCES_DIR: &str = "tests/resources"; #[test] fn test_forward_log_reader_fixture_db1() { - let _ = env_logger::builder().is_test(true).try_init(); let metadata_path = Path::new(TEST_RESOURCES_DIR).join("test_metadata_1"); let data_path = Path::new(TEST_RESOURCES_DIR).join("test_data_1"); let metadata_file = fs::OpenOptions::new() diff --git a/log_db/tests/integration.rs b/log_db/tests/integration.rs index 5d56fbf..31d2831 100644 --- a/log_db/tests/integration.rs +++ b/log_db/tests/integration.rs @@ -27,10 +27,6 @@ pub fn tmp_dir() -> String { #[ctor] fn init_logger() { let _ = env_logger::builder().is_test(true).try_init(); - - // todo add panic hook stuff - // - https://stackoverflow.com/questions/54917373/retrieving-backtrace-from-a-panic-in-hook-in-rust - // - https://github.com/sndels/yuki/blob/e86b379165ec657197b1c14b78164bd09a8aa1dc/yuki/src/main.rs#L74 } #[derive(Eq, PartialEq, Clone, Debug)] -- cgit v1.3