From 40a4a7dd2e5e206f96b4cc13fb7759cfa84d2ad2 Mon Sep 17 00:00:00 2001
From: Dean Li <deantvv@gmail.com>
Date: Sat, 30 Oct 2021 23:51:23 +0800
Subject: [PATCH 1/2] show log in testing

---
 src/macros.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/macros.rs b/src/macros.rs
index b69af36..7e324a5 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -1,9 +1,17 @@
+#[cfg(not(test))]
 #[cfg(feature = "log")]
 macro_rules! net_log {
     (trace, $($arg:expr),*) => { log::trace!($($arg),*) };
     (debug, $($arg:expr),*) => { log::debug!($($arg),*) };
 }
 
+#[cfg(test)]
+#[cfg(feature = "log")]
+macro_rules! net_log {
+    (trace, $($arg:expr),*) => { println!($($arg),*) };
+    (debug, $($arg:expr),*) => { println!($($arg),*) };
+}
+
 #[cfg(feature = "defmt")]
 macro_rules! net_log {
     (trace, $($arg:expr),*) => { defmt::trace!($($arg),*) };

From 565da5ab333232b6dd6b66e44571d0bd9deac560 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 3 Nov 2021 23:00:26 +0100
Subject: [PATCH 2/2] Remove manual `log::set_logger` from tests.

No longer needed since `net_debug!` and `net_trace!` now call `println!` directly
when testing!
---
 src/socket/dhcpv4.rs | 27 ---------------------------
 src/socket/tcp.rs    | 30 ------------------------------
 2 files changed, 57 deletions(-)

diff --git a/src/socket/dhcpv4.rs b/src/socket/dhcpv4.rs
index 4906ebb..c60fa89 100644
--- a/src/socket/dhcpv4.rs
+++ b/src/socket/dhcpv4.rs
@@ -651,30 +651,6 @@ mod test {
         });
     }
 
-    #[cfg(feature = "log")]
-    fn init_logger() {
-        struct Logger;
-        static LOGGER: Logger = Logger;
-
-        impl log::Log for Logger {
-            fn enabled(&self, _metadata: &log::Metadata) -> bool {
-                true
-            }
-
-            fn log(&self, record: &log::Record) {
-                println!("{}", record.args());
-            }
-
-            fn flush(&self) {}
-        }
-
-        // If it fails, that just means we've already set it to the same value.
-        let _ = log::set_logger(&LOGGER);
-        log::set_max_level(log::LevelFilter::Trace);
-
-        println!();
-    }
-
     // =========================================================================================//
     // Constants
 
@@ -822,9 +798,6 @@ mod test {
     // Tests
 
     fn socket() -> Dhcpv4Socket {
-        #[cfg(feature = "log")]
-        init_logger();
-
         let mut s = Dhcpv4Socket::new();
         assert_eq!(s.poll(), Some(Event::Deconfigured));
         s
diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
index e2d404d..f8da8f8 100644
--- a/src/socket/tcp.rs
+++ b/src/socket/tcp.rs
@@ -2648,38 +2648,11 @@ mod test {
         }};
     }
 
-    #[cfg(feature = "log")]
-    fn init_logger() {
-        struct Logger;
-        static LOGGER: Logger = Logger;
-
-        impl log::Log for Logger {
-            fn enabled(&self, _metadata: &log::Metadata) -> bool {
-                true
-            }
-
-            fn log(&self, record: &log::Record) {
-                println!("{}", record.args());
-            }
-
-            fn flush(&self) {}
-        }
-
-        // If it fails, that just means we've already set it to the same value.
-        let _ = log::set_logger(&LOGGER);
-        log::set_max_level(log::LevelFilter::Trace);
-
-        println!();
-    }
-
     fn socket() -> TcpSocket<'static> {
         socket_with_buffer_sizes(64, 64)
     }
 
     fn socket_with_buffer_sizes(tx_len: usize, rx_len: usize) -> TcpSocket<'static> {
-        #[cfg(feature = "log")]
-        init_logger();
-
         let rx_buffer = SocketBuffer::new(vec![0; rx_len]);
         let tx_buffer = SocketBuffer::new(vec![0; tx_len]);
         let mut socket = TcpSocket::new(rx_buffer, tx_buffer);
@@ -7048,9 +7021,6 @@ mod test {
 
     #[test]
     fn test_rtt_estimator() {
-        #[cfg(feature = "log")]
-        init_logger();
-
         let mut r = RttEstimator::default();
 
         let rtos = &[