Merge pull request #515 from cakebaker/bump_uutest

sylvestre · web-flow · commit 7dbd174ef579 · 2025-09-07T14:13:49.000+02:00
Bump `uutest` &amp; remove unused imports in tests
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,7 +74,7 @@ terminal_size = "0.4.2"
 textwrap = { version = "0.16.1", features = ["terminal_size"] }
 thiserror = "2.0.4"
 uucore = "0.1.0"
-uutests = "0.1.0"
+uutests = "0.2.0"
 walkdir = "2.5.0"
 windows = { version = "0.62.0" }
 windows-sys = { version = "0.61.0", default-features = false }
diff --git a/tests/by-util/test_free.rs b/tests/by-util/test_free.rs
@@ -7,8 +7,6 @@ use pretty_assertions::assert_eq;
 use regex::Regex;
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 // TODO: make tests combineable (e.g. test --total --human)
 
diff --git a/tests/by-util/test_pgrep.rs b/tests/by-util/test_pgrep.rs
@@ -12,8 +12,6 @@ use std::{
 #[cfg(target_os = "linux")]
 use regex::Regex;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[cfg(target_os = "linux")]
 const SINGLE_PID: &str = "^[1-9][0-9]*";
diff --git a/tests/by-util/test_pidof.rs b/tests/by-util/test_pidof.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_no_args() {
diff --git a/tests/by-util/test_pidwait.rs b/tests/by-util/test_pidwait.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
diff --git a/tests/by-util/test_pkill.rs b/tests/by-util/test_pkill.rs
@@ -5,10 +5,6 @@
 
 #[cfg(unix)]
 use uutests::new_ucmd;
-#[cfg(unix)]
-use uutests::util::TestScenario;
-#[cfg(unix)]
-use uutests::util_name;
 
 #[cfg(unix)]
 #[test]
diff --git a/tests/by-util/test_pmap.rs b/tests/by-util/test_pmap.rs
@@ -8,8 +8,8 @@ use regex::Regex;
 #[cfg(target_os = "linux")]
 use std::process;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
+#[cfg(target_os = "linux")]
+use uutests::{util::TestScenario, util_name};
 
 const NON_EXISTING_PID: &str = "999999";
 #[cfg(target_os = "linux")]
diff --git a/tests/by-util/test_ps.rs b/tests/by-util/test_ps.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 #[cfg(target_os = "linux")]
diff --git a/tests/by-util/test_pwdx.rs b/tests/by-util/test_pwdx.rs
@@ -8,8 +8,6 @@ use std::process;
 use regex::Regex;
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_no_args() {
diff --git a/tests/by-util/test_skill.rs b/tests/by-util/test_skill.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_no_args() {
diff --git a/tests/by-util/test_slabtop.rs b/tests/by-util/test_slabtop.rs
@@ -7,8 +7,8 @@
 use uutests::util::run_ucmd_as_root;
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
+#[cfg(target_os = "linux")]
+use uutests::{util::TestScenario, util_name};
 
 #[test]
 fn test_invalid_arg() {
diff --git a/tests/by-util/test_snice.rs b/tests/by-util/test_snice.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_no_args() {
diff --git a/tests/by-util/test_sysctl.rs b/tests/by-util/test_sysctl.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
@@ -16,8 +14,6 @@ fn test_invalid_arg() {
 mod linux {
 
     use uutests::new_ucmd;
-    use uutests::util::TestScenario;
-    use uutests::util_name;
 
     #[test]
     fn test_get_simple() {
@@ -75,8 +71,6 @@ mod linux {
 mod non_linux {
 
     use uutests::new_ucmd;
-    use uutests::util::TestScenario;
-    use uutests::util_name;
 
     #[test]
     fn test_fails_on_unsupported_platforms() {
diff --git a/tests/by-util/test_tload.rs b/tests/by-util/test_tload.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
diff --git a/tests/by-util/test_top.rs b/tests/by-util/test_top.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
diff --git a/tests/by-util/test_vmstat.rs b/tests/by-util/test_vmstat.rs
@@ -6,8 +6,6 @@
 #[cfg(target_os = "linux")]
 use std::time::Duration;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_simple() {
diff --git a/tests/by-util/test_w.rs b/tests/by-util/test_w.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
diff --git a/tests/by-util/test_watch.rs b/tests/by-util/test_watch.rs
@@ -4,8 +4,6 @@
 // file that was distributed with this source code.
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 // runddl32.exe has no console window, no side effects,
 // and no arguments are required.
