Merge branch 'master' into issue2147

tests/by-util/test_dirname.rs

@@ -16,6 +16,21 @@ fn test_path_without_trailing_slashes() {
         .stdout_is("/root/alpha/beta/gamma/delta/epsilon\n");
 }
 
+#[test]
+fn test_path_without_trailing_slashes_and_zero() {
+    new_ucmd!()
+        .arg("-z")
+        .arg("/root/alpha/beta/gamma/delta/epsilon/omega")
+        .succeeds()
+        .stdout_is("/root/alpha/beta/gamma/delta/epsilon\u{0}");
+
+    new_ucmd!()
+        .arg("--zero")
+        .arg("/root/alpha/beta/gamma/delta/epsilon/omega")
+        .succeeds()
+        .stdout_is("/root/alpha/beta/gamma/delta/epsilon\u{0}");
+}
+
 #[test]
 fn test_root() {
     new_ucmd!().arg("/").run().stdout_is("/\n");

tests/by-util/test_ls.rs

@@ -559,6 +559,7 @@ fn test_ls_long_ctime() {
 }
 
 #[test]
+#[ignore]
 fn test_ls_order_birthtime() {
     let scene = TestScenario::new(util_name!());
     let at = &scene.fixtures;
@@ -583,6 +584,7 @@ fn test_ls_order_birthtime() {
 }
 
 #[test]
+#[ignore]
 fn test_ls_styles() {
     let scene = TestScenario::new(util_name!());
     let at = &scene.fixtures;

tests/by-util/test_pinky.rs

@@ -34,6 +34,36 @@ fn test_long_format() {
     ));
 }
 
+#[cfg(target_os = "linux")]
+#[test]
+fn test_long_format_multiple_users() {
+    let scene = TestScenario::new(util_name!());
+
+    let expected = scene
+        .cmd_keepenv(util_name!())
+        .env("LANGUAGE", "C")
+        .arg("-l")
+        .arg("root")
+        .arg("root")
+        .arg("root")
+        .succeeds();
+
+    scene
+        .ucmd()
+        .arg("-l")
+        .arg("root")
+        .arg("root")
+        .arg("root")
+        .succeeds()
+        .stdout_is(expected.stdout_str());
+}
+
+#[test]
+fn test_long_format_wo_user() {
+    // "no username specified; at least one must be specified when using -l"
+    new_ucmd!().arg("-l").fails().code_is(1);
+}
+
 #[cfg(target_os = "linux")]
 #[test]
 fn test_short_format_i() {

tests/by-util/test_sort.rs

@@ -16,15 +16,15 @@ fn test_helper(file_name: &str, args: &str) {
 }
 
 // FYI, the initialization size of our Line struct is 96 bytes.
-//  
-// At very small buffer sizes, with that overhead we are certainly going 
-// to overrun our buffer way, way, way too quickly because of these excess 
+//
+// At very small buffer sizes, with that overhead we are certainly going
+// to overrun our buffer way, way, way too quickly because of these excess
 // bytes for the struct.
 //
 // For instance, seq 0..20000 > ...text = 108894 bytes
 // But overhead is 1920000 + 108894 = 2028894 bytes
 //
-// Or kjvbible-random.txt = 4332506 bytes, but minimum size of its 
+// Or kjvbible-random.txt = 4332506 bytes, but minimum size of its
 // 99817 lines in memory * 96 bytes = 9582432 bytes
 //
 // Here, we test 108894 bytes with a 50K buffer
@@ -59,7 +59,7 @@ fn test_human_numeric_whitespace() {
     test_helper("human-numeric-whitespace", "-h");
 }
 
-// This tests where serde often fails when reading back JSON 
+// This tests where serde often fails when reading back JSON
 // if it finds a null value
 #[test]
 fn test_extsort_as64_bailout() {

tests/by-util/test_tr.rs

@@ -45,6 +45,20 @@ fn test_delete_complement() {
         .stdout_is("ac");
 }
 
+#[test]
+fn test_delete_complement_2() {
+    new_ucmd!()
+        .args(&["-d", "-C", "0-9"])
+        .pipe_in("Phone: 01234 567890")
+        .succeeds()
+        .stdout_is("01234567890");
+    new_ucmd!()
+        .args(&["-d", "--complement", "0-9"])
+        .pipe_in("Phone: 01234 567890")
+        .succeeds()
+        .stdout_is("01234567890");
+}
+
 #[test]
 fn test_complement1() {
     new_ucmd!()

tests/by-util/test_truncate.rs

@@ -224,8 +224,14 @@ fn test_size_and_reference() {
     let mut file1 = at.make_file(TFILE1);
     let mut file2 = at.make_file(TFILE2);
     file1.write_all(b"1234567890").unwrap();
-    ucmd.args(&["--reference", TFILE1, "--size", "+5", TFILE2]).succeeds();
+    ucmd.args(&["--reference", TFILE1, "--size", "+5", TFILE2])
+        .succeeds();
     file2.seek(SeekFrom::End(0)).unwrap();
     let actual = file2.seek(SeekFrom::Current(0)).unwrap();
-    assert!(expected == actual, "expected '{}' got '{}'", expected, actual);
+    assert!(
+        expected == actual,
+        "expected '{}' got '{}'",
+        expected,
+        actual
+    );
 }