RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-09-16 03:36:18 +00:00
Code Issues Activity

Merge pull request #3376 from jfinkels/df-error-on-nonexistent-files

Browse source 
df: show error when file argument does not exist
This commit is contained in:
Sylvestre Ledru 2022-04-12 09:27:59 +02:00 • committed by GitHub
commit f114d63b4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tests/by-util/test_df.rs
View file

@ -28,16 +28,18 @@ fn test_df_compatible_si() {
#[test]
fn test_df_output() {
// TODO These should fail because `-total` should have two dashes,
// not just one. But they don't fail.
if cfg!(target_os = "macos") {
new_ucmd!().arg("-H").arg("-total").succeeds().
stdout_only("Filesystem Size Used Available Capacity Use% Mounted on \n");
let expected = if cfg!(target_os = "macos") {
"Filesystem Size Used Available Capacity Use% Mounted on "
} else {
new_ucmd!().arg("-H").arg("-total").succeeds().stdout_only(
"Filesystem Size Used Available Use% Mounted on \n",
);
}
"Filesystem Size Used Available Use% Mounted on "
};
let output = new_ucmd!()
.arg("-H")
.arg("--total")
.succeeds()
.stdout_move_str();
let actual = output.lines().take(1).collect::<Vec<&str>>()[0];
assert_eq!(actual, expected);
}
/// Test that the order of rows in the table does not change across executions.
@ -295,3 +297,16 @@ fn test_output_field_no_more_than_once() {
.fails()
.usage_error("option --output: field 'target' used more than once");
}
#[test]
fn test_nonexistent_file() {
new_ucmd!()
.arg("does-not-exist")
.fails()
.stderr_only("df: does-not-exist: No such file or directory");
new_ucmd!()
.args(&["--output=file", "does-not-exist", "."])
.fails()
.stderr_is("df: does-not-exist: No such file or directory\n")
.stdout_is("File \n. \n");
}