From b7c6eee6603c6d6809820f707d8290aa0207511e Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Fri, 8 Nov 2024 14:26:19 +0100
Subject: [PATCH 1/2] tests: fix "unused import" warnings on Windows

---
 tests/by-util/test_last.rs   | 2 ++
 tests/by-util/test_setsid.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/by-util/test_last.rs b/tests/by-util/test_last.rs
index b0ca6ba..8a45990 100644
--- a/tests/by-util/test_last.rs
+++ b/tests/by-util/test_last.rs
@@ -4,8 +4,10 @@
 // file that was distributed with this source code.
 // spell-checker:ignore (words) symdir somefakedir
 
+#[cfg(unix)]
 use crate::common::util::TestScenario;
 
+#[cfg(unix)]
 use regex::Regex;
 use std::fs;
 use std::io::Write;
diff --git a/tests/by-util/test_setsid.rs b/tests/by-util/test_setsid.rs
index cf3d159..878e1f8 100644
--- a/tests/by-util/test_setsid.rs
+++ b/tests/by-util/test_setsid.rs
@@ -161,7 +161,7 @@ mod unix {
 
 #[cfg(not(target_family = "unix"))]
 mod non_unix {
-    use crate::common::util::{TestScenario, UCommand};
+    use crate::common::util::TestScenario;
 
     #[test]
     fn unsupported_platforms() {

From ea8f471b7a89a0205a45152796f3b7af1ff0baa5 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Fri, 8 Nov 2024 14:33:43 +0100
Subject: [PATCH 2/2] last: adapt test to fix "unused import" warnings

---
 tests/by-util/test_last.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/by-util/test_last.rs b/tests/by-util/test_last.rs
index 8a45990..47ec8f5 100644
--- a/tests/by-util/test_last.rs
+++ b/tests/by-util/test_last.rs
@@ -9,8 +9,6 @@ use crate::common::util::TestScenario;
 
 #[cfg(unix)]
 use regex::Regex;
-use std::fs;
-use std::io::Write;
 
 #[test]
 #[cfg(unix)]
@@ -95,19 +93,18 @@ fn test_timestamp_format_iso() {
 #[test]
 #[cfg(unix)]
 fn test_short_invalid_utmp_file() {
-    let filepath = "/tmp/testfile";
-    let testfile = fs::File::create(filepath);
+    let (at, mut ucmd) = at_and_ucmd!();
+    let file = "testfile";
     // Random bytes
-    let data: Vec<u8> = vec![
+    let data = [
         4, 5, 6, 16, 8, 13, 2, 12, 5, 3, 11, 5, 1, 13, 1, 1, 0, 9, 5, 5, 2, 8, 4,
     ];
-    let _ = testfile.unwrap().write_all(&data);
+    at.write_bytes(file, &data);
 
     let regex = Regex::new(r"\n\S*\sbegins\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s*[0-9][0-9]?\s*[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s*[0-9]*")
             .unwrap();
 
-    new_ucmd!()
-        .arg(format!("--file={filepath}"))
+    ucmd.arg(format!("--file={file}"))
         .succeeds()
         .stdout_matches(&regex);
 }