Merge branch 'master' into id_zero_2351

tests/by-util/test_groups.rs

@@ -1,41 +1,53 @@
 use crate::common::util::*;
 
 #[test]
+#[cfg(any(target_vendor = "apple", target_os = "linux"))]
 fn test_groups() {
-    let result = new_ucmd!().run();
-    println!("result.stdout = {}", result.stdout_str());
-    println!("result.stderr = {}", result.stderr_str());
-    if is_ci() && result.stdout_str().trim().is_empty() {
-        // In the CI, some server are failing to return the group.
-        // As seems to be a configuration issue, ignoring it
-        return;
+    if !is_ci() {
+        new_ucmd!().succeeds().stdout_is(expected_result(&[]));
+    } else {
+        // TODO: investigate how this could be tested in CI
+        // stderr = groups: cannot find name for group ID 116
+        println!("test skipped:");
     }
-    result.success();
-    assert!(!result.stdout_str().trim().is_empty());
 }
 
 #[test]
-fn test_groups_arg() {
-    // get the username with the "id -un" command
-    let result = TestScenario::new("id").ucmd_keepenv().arg("-un").run();
-    println!("result.stdout = {}", result.stdout_str());
-    println!("result.stderr = {}", result.stderr_str());
-    let s1 = String::from(result.stdout_str().trim());
-    if is_ci() && s1.parse::<f64>().is_ok() {
-        // In the CI, some server are failing to return id -un.
-        // So, if we are getting a uid, just skip this test
-        // As seems to be a configuration issue, ignoring it
+#[cfg(any(target_os = "linux"))]
+#[ignore = "fixme: 'groups USERNAME' needs more debugging"]
+fn test_groups_username() {
+    let scene = TestScenario::new(util_name!());
+    let whoami_result = scene.cmd("whoami").run();
+
+    let username = if whoami_result.succeeded() {
+        whoami_result.stdout_move_str()
+    } else if is_ci() {
+        String::from("docker")
+    } else {
+        println!("test skipped:");
         return;
-    }
+    };
 
-    println!("result.stdout = {}", result.stdout_str());
-    println!("result.stderr = {}", result.stderr_str());
-    result.success();
-    assert!(!result.stdout_str().is_empty());
-    let username = result.stdout_str().trim();
+    // TODO: stdout should be in the form: "username : group1 group2 group3"
 
-    // call groups with the user name to check that we
-    // are getting something
-    new_ucmd!().arg(username).succeeds();
-    assert!(!result.stdout_str().is_empty());
+    scene
+        .ucmd()
+        .arg(&username)
+        .succeeds()
+        .stdout_is(expected_result(&[&username]));
+}
+
+#[cfg(any(target_vendor = "apple", target_os = "linux"))]
+fn expected_result(args: &[&str]) -> String {
+    #[cfg(target_os = "linux")]
+    let util_name = util_name!();
+    #[cfg(target_vendor = "apple")]
+    let util_name = format!("g{}", util_name!());
+
+    TestScenario::new(&util_name)
+        .cmd_keepenv(util_name)
+        .env("LANGUAGE", "C")
+        .args(args)
+        .succeeds()
+        .stdout_move_str()
 }

tests/by-util/test_id.rs

@@ -112,28 +112,23 @@ fn test_id_group() {
 }
 
 #[test]
+#[cfg(any(target_vendor = "apple", target_os = "linux"))]
 fn test_id_groups() {
     let scene = TestScenario::new(util_name!());
-
-    let result = scene.ucmd().arg("-G").succeeds();
-    let groups = result.stdout_str().trim().split_whitespace();
-    for s in groups {
-        assert!(s.parse::<u64>().is_ok());
-    }
-
-    let result = scene.ucmd().arg("--groups").succeeds();
-    let groups = result.stdout_str().trim().split_whitespace();
-    for s in groups {
-        assert!(s.parse::<u64>().is_ok());
-    }
-
-    #[cfg(any(target_vendor = "apple", target_os = "linux"))]
-    for args in &["-G", "--groups"] {
-        let expect = expected_result(&[args], false);
-        let actual = new_ucmd!().arg(&args).succeeds().stdout_move_str();
-        let mut v_actual: Vec<&str> = actual.split_whitespace().collect();
-        let mut v_expect: Vec<&str> = expect.split_whitespace().collect();
-        assert_eq!(v_actual.sort_unstable(), v_expect.sort_unstable());
+    for g_flag in &["-G", "--groups"] {
+        scene
+            .ucmd()
+            .arg(g_flag)
+            .succeeds()
+            .stdout_is(expected_result(&[g_flag], false));
+        for &r_flag in &["-r", "--real"] {
+            let args = [g_flag, r_flag];
+            scene
+                .ucmd()
+                .args(&args)
+                .succeeds()
+                .stdout_is(expected_result(&args, false));
+        }
     }
 }
 
@@ -196,26 +191,28 @@ fn test_id_password_style() {
 #[test]
 #[cfg(any(target_vendor = "apple", target_os = "linux"))]
 fn test_id_default_format() {
+    let scene = TestScenario::new(util_name!());
     // -ugG
     for flag in &["--name", "--real"] {
-        new_ucmd!()
+        scene
+            .ucmd()
             .arg(flag)
             .fails()
             .stderr_is(expected_result(&[flag], true));
         for &opt in &["--user", "--group", "--groups"] {
             if is_ci() && *flag == "--name" {
-                // '--name' does not work in CI:
+                // '--name' does not work on CICD ubuntu-16/ubuntu-18
                 // id: cannot find name for user ID 1001
                 // id: cannot find name for group ID 116
-                println!("test skipped:");
+                println!("test skipped");
                 continue;
             }
             let args = [opt, flag];
-            let expect = expected_result(&args, false);
-            let actual = new_ucmd!().args(&args).succeeds().stdout_move_str();
-            let mut v_actual: Vec<&str> = actual.split_whitespace().collect();
-            let mut v_expect: Vec<&str> = expect.split_whitespace().collect();
-            assert_eq!(v_actual.sort_unstable(), v_expect.sort_unstable());
+            scene
+                .ucmd()
+                .args(&args)
+                .succeeds()
+                .stdout_is(expected_result(&args, false));
         }
     }
 }
@@ -231,21 +228,13 @@ fn test_id_zero() {
                 .fails()
                 .stderr_is(expected_result(&args, true));
         }
-        for &opt in &["-u", "--user", "-g", "--group"] {
+        for &opt in &["-u", "--user", "-g", "--group", "-G", "--groups"] {
             let args = [opt, z_flag];
             new_ucmd!()
                 .args(&args)
                 .succeeds()
                 .stdout_is(expected_result(&args, false));
         }
-        // '--groups' ids are in no particular order and when paired with '--zero' there's no
-        // delimiter which makes the split_whitespace-collect-into-vector comparison impossible.
-        for opt in &["-G", "--groups"] {
-            let args = [opt, z_flag];
-            let result = new_ucmd!().args(&args).succeeds().stdout_move_str();
-            assert!(!result.contains(" "));
-            assert!(result.ends_with('\0'));
-        }
     }
 }
 
@@ -271,7 +260,6 @@ fn expected_result(args: &[&str], exp_fail: bool) -> String {
             .fails()
             .stderr_move_str()
     };
-    // #[cfg(target_vendor = "apple")]
     return if cfg!(target_os = "macos") && result.starts_with("gid") {
         result[1..].to_string()
     } else {

tests/by-util/test_sort.rs

@@ -792,3 +792,64 @@ fn test_nonexistent_file() {
 fn test_blanks() {
     test_helper("blanks", &["-b", "--ignore-blanks"]);
 }
+
+#[test]
+fn sort_multiple() {
+    new_ucmd!()
+        .args(&["no_trailing_newline1.txt", "no_trailing_newline2.txt"])
+        .succeeds()
+        .stdout_is("a\nb\nb\n");
+}
+
+#[test]
+fn sort_empty_chunk() {
+    new_ucmd!()
+        .args(&["-S", "40B"])
+        .pipe_in("a\na\n")
+        .succeeds()
+        .stdout_is("a\na\n");
+}
+
+#[test]
+#[cfg(target_os = "linux")]
+fn test_compress() {
+    new_ucmd!()
+        .args(&[
+            "ext_sort.txt",
+            "-n",
+            "--compress-program",
+            "gzip",
+            "-S",
+            "10",
+        ])
+        .succeeds()
+        .stdout_only_fixture("ext_sort.expected");
+}
+
+#[test]
+fn test_compress_fail() {
+    new_ucmd!()
+        .args(&[
+            "ext_sort.txt",
+            "-n",
+            "--compress-program",
+            "nonexistent-program",
+            "-S",
+            "10",
+        ])
+        .fails()
+        .stderr_only("sort: couldn't execute compress program: errno 2");
+}
+
+#[test]
+fn test_merge_batches() {
+    new_ucmd!()
+        .args(&[
+            "ext_sort.txt",
+            "-n",
+            "-S",
+            "150B",
+        ])
+        .succeeds()
+        .stdout_only_fixture("ext_sort.expected");
+}

tests/fixtures/sort/no_trailing_newline1.txt

@@ -0,0 +1,2 @@
+a
+b

tests/fixtures/sort/no_trailing_newline2.txt

@@ -0,0 +1 @@
+b