From e5355eb134230fd241b966b2ddd67ab5a6ed8927 Mon Sep 17 00:00:00 2001
From: Riccardo Casatta <riccardo@casatta.it>
Date: Mon, 19 Aug 2024 16:04:31 +0200
Subject: [PATCH 1/2] Avoid print logs in tests

to instead have logs like before use `RUST_LOG=debug cargo test`
---
 tests/common.rs   | 10 ++++++++--
 tests/electrum.rs |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/common.rs b/tests/common.rs
index c85ebf7d9..23c7ce1e2 100644
--- a/tests/common.rs
+++ b/tests/common.rs
@@ -1,6 +1,8 @@
+use std::str::FromStr;
 use std::sync::{Arc, Once, RwLock};
 use std::{env, net};
 
+use log::LevelFilter;
 use stderrlog::StdErrLog;
 use tempfile::TempDir;
 
@@ -53,7 +55,7 @@ impl TestRunner {
             #[cfg(feature = "liquid")]
             node_conf.args.push("-anyonecanspendaremine=1");
 
-            node_conf.view_stdout = true;
+            node_conf.view_stdout = std::env::var_os("RUST_LOG").is_some();
         }
 
         // Setup node
@@ -310,7 +312,11 @@ fn generate(
 fn init_log() -> StdErrLog {
     static ONCE: Once = Once::new();
     let mut log = stderrlog::new();
-    log.verbosity(4);
+    match std::env::var("RUST_LOG") {
+        Ok(e) => log.verbosity(LevelFilter::from_str(&e).unwrap_or(LevelFilter::Off)),
+        Err(_) => log.verbosity(0),
+    };
+
     // log.timestamp(stderrlog::Timestamp::Millisecond        );
     ONCE.call_once(|| log.init().expect("logging initialization failed"));
     log
diff --git a/tests/electrum.rs b/tests/electrum.rs
index bb3115029..b2bab95f9 100644
--- a/tests/electrum.rs
+++ b/tests/electrum.rs
@@ -21,7 +21,11 @@ fn test_electrum() -> Result<()> {
     // Spawn an headless Electrum wallet RPC daemon, connected to Electrs
     let mut electrum_wallet_conf = electrumd::Conf::default();
     let server_arg = format!("{}:t", electrum_addr.to_string());
-    electrum_wallet_conf.args = vec!["-v", "--server", &server_arg];
+    electrum_wallet_conf.args = if std::env::var_os("RUST_LOG").is_some() {
+        vec!["-v", "--server", &server_arg]
+    } else {
+        vec!["--server", &server_arg]
+    };
     electrum_wallet_conf.view_stdout = true;
     let electrum_wallet = ElectrumD::with_conf(electrumd::exe_path()?, &electrum_wallet_conf)?;
 

From 16321d4a7523b98c199d02ce793d13dee79dedfa Mon Sep 17 00:00:00 2001
From: Riccardo Casatta <riccardo@casatta.it>
Date: Thu, 22 Aug 2024 14:56:59 +0200
Subject: [PATCH 2/2] print test logs in CI

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 7286c2fc5..bd7647b04 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -39,10 +39,10 @@ jobs:
       run: cargo check
 
     - name: Tests (Bitcoin mode, REST+Electrum)
-      run: cargo test
+      run: RUST_LOG=debug cargo test
 
     - name: Tests (Liquid mode, REST)
-      run: cargo test --features liquid
+      run: RUST_LOG=debug cargo test --features liquid
 
   nix:
     runs-on: ubuntu-latest