RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Fix broken tests due to updating Cargo.lock

Browse source
This commit is contained in:
Alex Lyon 2017-11-18 17:25:15 -08:00
parent 8c846e2aa9
commit 4ef2ef29cd
No known key found for this signature in database
GPG key ID: B517F04B325131B1
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pinky/pinky.rs
View file

@ -48,21 +48,21 @@ pub fn uumain(args: Vec<String>) -> i32 {
The utmp file will be {}", utmpx::DEFAULT_FILE); The utmp file will be {}", utmpx::DEFAULT_FILE);
let mut opts = new_coreopts!(SYNTAX, SUMMARY, &long_help); let mut opts = new_coreopts!(SYNTAX, SUMMARY, &long_help);
opts.optflag("l", opts.optflag("l",
"l", "",
"produce long format output for the specified USERs"); "produce long format output for the specified USERs");
opts.optflag("b", opts.optflag("b",
"b", "",
"omit the user's home directory and shell in long format"); "omit the user's home directory and shell in long format");
opts.optflag("h", "h", "omit the user's project file in long format"); opts.optflag("h", "", "omit the user's project file in long format");
opts.optflag("p", "p", "omit the user's plan file in long format"); opts.optflag("p", "", "omit the user's plan file in long format");
opts.optflag("s", "s", "do short format output, this is the default"); opts.optflag("s", "", "do short format output, this is the default");
opts.optflag("f", "f", "omit the line of column headings in short format"); opts.optflag("f", "", "omit the line of column headings in short format");
opts.optflag("w", "w", "omit the user's full name in short format"); opts.optflag("w", "", "omit the user's full name in short format");
opts.optflag("i", opts.optflag("i",
"i", "",
"omit the user's full name and remote host in short format"); "omit the user's full name and remote host in short format");
opts.optflag("q", opts.optflag("q",
"q", "",
"omit the user's full name, remote host and idle time in short format"); "omit the user's full name, remote host and idle time in short format");
opts.optflag("", "help", "display this help and exit"); opts.optflag("", "help", "display this help and exit");
opts.optflag("", "version", "output version information and exit"); opts.optflag("", "version", "output version information and exit");

2
src/who/who.rs
View file

@ -55,7 +55,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
opts.optflag("H", "heading", "print line of column headings"); opts.optflag("H", "heading", "print line of column headings");
opts.optflag("l", "login", "print system login processes"); opts.optflag("l", "login", "print system login processes");
opts.optflag("", "lookup", "attempt to canonicalize hostnames via DNS"); opts.optflag("", "lookup", "attempt to canonicalize hostnames via DNS");
opts.optflag("m", "m", "only hostname and user associated with stdin"); opts.optflag("m", "", "only hostname and user associated with stdin");
opts.optflag("p", "process", "print active processes spawned by init"); opts.optflag("p", "process", "print active processes spawned by init");
opts.optflag("q", opts.optflag("q",
"count", "count",

2
tests/test_base32.rs
View file

@ -72,7 +72,7 @@ fn test_wrap_no_arg() {
new_ucmd!() new_ucmd!()
.arg(wrap_param) .arg(wrap_param)
.fails() .fails()
.stderr_only(format!("base32: error: Argument to option '{}' missing.\n", .stderr_only(format!("base32: error: Argument to option '{}' missing\n",
if wrap_param == "-w" { "w" } else { "wrap" })); if wrap_param == "-w" { "w" } else { "wrap" }));
} }
} }

2
tests/test_base64.rs
View file

@ -64,7 +64,7 @@ fn test_wrap_no_arg() {
new_ucmd!() new_ucmd!()
.arg(wrap_param) .arg(wrap_param)
.fails() .fails()
.stderr_only(format!("base64: error: Argument to option '{}' missing.\n", .stderr_only(format!("base64: error: Argument to option '{}' missing\n",
if wrap_param == "-w" { "w" } else { "wrap" })); if wrap_param == "-w" { "w" } else { "wrap" }));
} }
} }

4
tests/test_uniq.rs
View file

@ -65,14 +65,14 @@ fn test_stdin_all_repeated() {
#[test] #[test]
fn test_stdin_all_repeated_separate() { fn test_stdin_all_repeated_separate() {
new_ucmd!() new_ucmd!()
.args(&["--all-repeated", "separate"]).pipe_in_fixture(INPUT) .args(&["--all-repeated=separate"]).pipe_in_fixture(INPUT)
.run().stdout_is_fixture("sorted-all-repeated-separate.expected"); .run().stdout_is_fixture("sorted-all-repeated-separate.expected");
} }
#[test] #[test]
fn test_stdin_all_repeated_prepend() { fn test_stdin_all_repeated_prepend() {
new_ucmd!() new_ucmd!()
.args(&["--all-repeated", "prepend"]).pipe_in_fixture(INPUT) .args(&["--all-repeated=prepend"]).pipe_in_fixture(INPUT)
.run().stdout_is_fixture("sorted-all-repeated-prepend.expected"); .run().stdout_is_fixture("sorted-all-repeated-prepend.expected");
} }