logs: setup logging during a few tests

Author: pietroalbini

src/logs/mod.rs

@@ -3,10 +3,13 @@ mod storage;
 use crate::prelude::*;
 use log::{Log, Metadata, Record};
 use std::cell::RefCell;
+use std::sync::Once;
 use std::thread::LocalKey;
 
 pub use self::storage::LogStorage;
 
+static INIT_LOGS: Once = Once::new();
+
 thread_local! {
     static SCOPED: RefCell<Vec<Box<Log>>> = RefCell::new(Vec::new());
 }
@@ -71,19 +74,29 @@ where
     result
 }
 
-pub fn init() -> Fallible<()> {
-    // Initialize env_logger
-    // This doesn't use from_default_env() because it doesn't allow to override filter_module()
-    // with the RUST_LOG environment variable
-    let mut env = env_logger::Builder::new();
-    env.filter_module("crater", log::LevelFilter::Info);
-    if let Ok(content) = std::env::var("RUST_LOG") {
-        env.parse(&content);
-    }
+pub fn init() {
+    INIT_LOGS.call_once(|| {
+        // Initialize env_logger
+        // This doesn't use from_default_env() because it doesn't allow to override filter_module()
+        // with the RUST_LOG environment variable
+        let mut env = env_logger::Builder::new();
+        env.filter_module("crater", log::LevelFilter::Info);
+        if let Ok(content) = std::env::var("RUST_LOG") {
+            env.parse(&content);
+        }
 
-    let multi = MultiLogger::new(vec![Box::new(env.build())], &SCOPED);
-    log::set_boxed_logger(Box::new(multi))?;
-    log::set_max_level(log::LevelFilter::Trace);
+        let multi = MultiLogger::new(vec![Box::new(env.build())], &SCOPED);
+        log::set_boxed_logger(Box::new(multi)).unwrap();
+        log::set_max_level(log::LevelFilter::Trace);
+    });
+}
 
-    Ok(())
+#[cfg(test)]
+pub(crate) fn init_test() {
+    INIT_LOGS.call_once(|| {
+        // Avoid setting up ENV_LOGGER inside tests
+        let multi = MultiLogger::new(vec![], &SCOPED);
+        log::set_boxed_logger(Box::new(multi)).unwrap();
+        log::set_max_level(log::LevelFilter::Trace);
+    })
 }

src/main.rs

@@ -1,7 +1,7 @@
 use log::info;
 mod cli;
 
-use crater::{logs, utils};
+use crater::utils;
 use failure::Fallible;
 use std::panic;
 use std::process;
@@ -11,7 +11,7 @@ fn main() {
     // Ignore errors loading `.env` file.
     let _ = dotenv::dotenv();
 
-    let _guard = logs::init();
+    crater::logs::init();
     let success = match panic::catch_unwind(main_) {
         Ok(Ok(())) => true,
         Ok(Err(e)) => {

src/report/archives.rs

@@ -108,6 +108,8 @@ mod tests {
 
     #[test]
     fn test_logs_archives_generation() {
+        crate::logs::init_test();
+
         let config = Config::default();
         let db = Database::temp().unwrap();
         let writer = DummyWriter::default();

src/results/db.rs

@@ -278,6 +278,8 @@ mod tests {
 
     #[test]
     fn test_results() {
+        crate::logs::init_test();
+
         let db = Database::temp().unwrap();
         let results = DatabaseDB::new(&db);
         let config = Config::default();
@@ -310,10 +312,6 @@ mod tests {
                 .unwrap(),
             Some(TestResult::TestPass)
         );
-        assert_eq!(
-            results.get_result(&ex, &MAIN_TOOLCHAIN, &krate).unwrap(),
-            Some(TestResult::TestPass)
-        );
         assert!(String::from_utf8_lossy(
             &results
                 .load_log(&ex, &MAIN_TOOLCHAIN, &krate)