greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error message tests for Alpine Linux (#956)

Browse Source
This commit is contained in:
Casey Rodarmor 2021-08-27 17:01:50 -07:00 committed by GitHub
parent dbf142369b
commit 4f9a77fff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/choose.rs
View File

@ -160,9 +160,10 @@ fn status_error() {
.output() .output()
.unwrap(); .unwrap();
assert_eq!( assert!(
String::from_utf8_lossy(&output.stderr), Regex::new("^error: Chooser `exit-2` failed: exit (code|status): 2\n$")
"error: Chooser `exit-2` failed: exit code: 2\n", .unwrap()
.is_match(str::from_utf8(&output.stderr).unwrap())
); );
assert_eq!(output.status.code().unwrap(), 2); assert_eq!(output.status.code().unwrap(), 2);

2
tests/command.rs
View File

@ -91,7 +91,7 @@ test! {
echo XYZ echo XYZ
", ",
args: ("--command", "false"), args: ("--command", "false"),
stderr: "error: Command `false` failed: exit code: 1\n", stderr_regex: "error: Command `false` failed: exit (code|status): 1\n",
status: EXIT_FAILURE, status: EXIT_FAILURE,
} }

7
tests/edit.rs
View File

@ -79,9 +79,10 @@ fn status_error() {
.output() .output()
.unwrap(); .unwrap();
assert_eq!( assert!(
String::from_utf8_lossy(&output.stderr), Regex::new("^error: Editor `exit-2` failed: exit (code|status): 2\n$")
"error: Editor `exit-2` failed: exit code: 2\n" .unwrap()
.is_match(str::from_utf8(&output.stderr).unwrap(),)
); );
assert_eq!(output.status.code().unwrap(), 2); assert_eq!(output.status.code().unwrap(), 2);

22
tests/test.rs
View File

@ -3,17 +3,18 @@ use crate::common::*;
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
macro_rules! test { macro_rules! test {
( {
name: $name:ident, name: $name:ident,
$(justfile: $justfile:expr,)? $(justfile: $justfile:expr,)?
$(args: ($($arg:tt),*),)? $(args: ($($arg:tt),*),)?
$(env: { $($env_key:literal : $env_value:literal,)* },)? $(env: { $($env_key:literal : $env_value:literal,)* },)?
$(stdin: $stdin:expr,)? $(stdin: $stdin:expr,)?
$(stdout: $stdout:expr,)? $(stdout: $stdout:expr,)?
$(stderr: $stderr:expr,)? $(stderr: $stderr:expr,)?
$(status: $status:expr,)? $(stderr_regex: $stderr_regex:expr,)?
$(shell: $shell:expr,)? $(status: $status:expr,)?
) => { $(shell: $shell:expr,)?
} => {
#[test] #[test]
fn $name() { fn $name() {
let test = crate::test::Test::new(); let test = crate::test::Test::new();
@ -24,6 +25,7 @@ macro_rules! test {
$(let test = test.shell($shell);)? $(let test = test.shell($shell);)?
$(let test = test.status($status);)? $(let test = test.status($status);)?
$(let test = test.stderr($stderr);)? $(let test = test.stderr($stderr);)?
$(let test = test.stderr_regex($stderr_regex);)?
$(let test = test.stdin($stdin);)? $(let test = test.stdin($stdin);)?
$(let test = test.stdout($stdout);)? $(let test = test.stdout($stdout);)?