Merge pull request #273 from sylvestre/mv-uutests

Move to use uutests

Author: cakebaker

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+repos:
+-   repo: local
+    hooks:
+    -   id: rust-linting
+        name: Rust linting
+        description: Run cargo fmt on files included in the commit.
+        entry: cargo +stable fmt --
+        pass_filenames: true
+        types: [file, rust]
+        language: system
+    -   id: rust-clippy
+        name: Rust clippy
+        description: Run cargo clippy on files included in the commit.
+        entry: cargo +stable clippy --workspace --all-targets --all-features --
+        pass_filenames: false
+        types: [file, rust]
+        language: system

Cargo.lock

@@ -56,6 +56,7 @@ libmount-sys = "0.1.1"
 linux-raw-sys = { version = "0.10.0", features = ["ioctl"] }
 md-5 = "0.10.6"
 nix = { version = "0.30", default-features = false }
+parse_datetime = "0.11.0"
 phf = "0.12.0"
 phf_codegen = "0.12.1"
 rand = { version = "0.9.0", features = ["small_rng"] }
@@ -71,21 +72,21 @@ textwrap = { version = "0.16.0", features = ["terminal_size"] }
 thiserror = "2.0"
 uucore = "0.1.0"
 uuid = { version = "1.16.0", features = ["rng-rand"] }
+uutests = "0.1.0"
 windows = { version = "0.61.1" }
 xattr = "1.3.1"
-parse_datetime = "0.11.0"
 
 [dependencies]
 clap = { workspace = true }
 clap_complete = { workspace = true }
 clap_mangen = { workspace = true }
 dns-lookup = { workspace = true }
+parse_datetime = {workspace = true}
 phf = { workspace = true }
 serde = { workspace = true }
 serde_json  = { workspace = true }
 textwrap = { workspace = true }
 uucore = { workspace = true }
-parse_datetime = {workspace = true}
 
 #
 blockdev = { optional = true, version = "0.0.1", package = "uu_blockdev", path = "src/uu/blockdev" }
@@ -107,13 +108,15 @@ setsid = { optional = true, version = "0.0.1", package = "uu_setsid", path ="src
 uuidgen = { optional = true, version = "0.0.1", package = "uu_uuidgen", path ="src/uu/uuidgen" }
 
 [dev-dependencies]
+ctor = "0.4.1"
 # dmesg test require fixed-boot-time feature turned on.
 dmesg = { version = "0.0.1", package = "uu_dmesg", path = "src/uu/dmesg", features = ["fixed-boot-time"] }
 libc = { workspace = true }
 pretty_assertions = "1"
 rand = { workspace = true }
 regex = { workspace = true }
 tempfile = { workspace = true }
+uutests = { workspace = true }
 uucore = { workspace = true, features = ["entries", "process", "signals"] }
 uuid = { workspace = true }
 

Cargo.toml

@@ -3,7 +3,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
@@ -23,9 +25,12 @@ fn test_report_mutually_exclusive_with_others() {
 
 #[cfg(target_os = "linux")]
 mod linux {
-    use crate::common::util::TestScenario;
     use regex::Regex;
 
+    use uutests::new_ucmd;
+    use uutests::util::TestScenario;
+    use uutests::util_name;
+
     #[test]
     fn test_fails_on_first_error() {
         new_ucmd!()
@@ -56,7 +61,9 @@ mod linux {
 
 #[cfg(not(target_os = "linux"))]
 mod non_linux {
-    use crate::common::util::TestScenario;
+    use uutests::new_ucmd;
+    use uutests::util::TestScenario;
+    use uutests::util_name;
 
     #[test]
     fn test_fails_on_unsupported_platforms() {

tests/by-util/test_blockdev.rs

@@ -4,7 +4,11 @@
 // file that was distributed with this source code.
 
 #[cfg(target_os = "linux")]
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+#[cfg(target_os = "linux")]
+use uutests::util::TestScenario;
+#[cfg(target_os = "linux")]
+use uutests::util_name;
 
 #[test]
 #[cfg(target_os = "linux")]

tests/by-util/test_ctrlaltdel.rs

@@ -2,7 +2,10 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-use crate::common::util::TestScenario;
+
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_dmesg.rs

@@ -3,7 +3,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {
@@ -23,7 +25,10 @@ fn test_operations_mutually_exclusive() {
 
 #[cfg(target_os = "linux")]
 mod linux {
-    use crate::common::util::TestScenario;
+
+    use uutests::new_ucmd;
+    use uutests::util::TestScenario;
+    use uutests::util_name;
 
     #[test]
     fn test_fails_on_non_existing_path() {
@@ -48,7 +53,9 @@ mod linux {
 
 #[cfg(not(target_os = "linux"))]
 mod non_linux {
-    use crate::common::util::TestScenario;
+    use uutests::new_ucmd;
+    use uutests::util::TestScenario;
+    use uutests::util_name;
 
     #[test]
     fn test_fails_on_unsupported_platforms() {

tests/by-util/test_fsfreeze.rs

@@ -4,8 +4,13 @@
 // file that was distributed with this source code.
 // spell-checker:ignore (words) symdir somefakedir
 
+use uutests::at_and_ucmd;
 #[cfg(unix)]
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+#[cfg(unix)]
+use uutests::util::TestScenario;
+#[cfg(unix)]
+use uutests::util_name;
 
 #[cfg(unix)]
 use regex::Regex;

tests/by-util/test_last.rs

@@ -3,7 +3,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_lscpu.rs

@@ -4,7 +4,11 @@
 // file that was distributed with this source code.
 
 #[cfg(target_os = "linux")]
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+#[cfg(target_os = "linux")]
+use uutests::util::TestScenario;
+#[cfg(target_os = "linux")]
+use uutests::util_name;
 
 #[test]
 #[cfg(target_os = "linux")]