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

Fix windows chooser invocation error message test (#1079)

Browse Source
This commit is contained in:
Casey Rodarmor 2022-01-30 12:32:38 -08:00 committed by GitHub
parent 27cd8fd554
commit b95e32c9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/choose.rs
View File

@ -125,11 +125,7 @@ fn invoke_error_function() {
echo bar echo bar
", ",
) )
.stderr(if cfg!(windows) { .stderr_regex("error: Chooser `/ -cu fzf` invocation failed: .*")
"error: Chooser `/ -cu fzf` invocation failed: Access is denied. (os error 5)\n"
} else {
"error: Chooser `/ -cu fzf` invocation failed: Permission denied (os error 13)\n"
})
.status(EXIT_FAILURE) .status(EXIT_FAILURE)
.shell(false) .shell(false)
.args(&["--shell", "/", "--choose"]) .args(&["--shell", "/", "--choose"])

4
tests/test.rs
View File

@ -125,7 +125,7 @@ impl Test {
} }
pub(crate) fn stderr_regex(mut self, stderr_regex: impl AsRef<str>) -> Self { pub(crate) fn stderr_regex(mut self, stderr_regex: impl AsRef<str>) -> Self {
self.stderr_regex = Some(Regex::new(&format!("^{}$", stderr_regex.as_ref())).unwrap()); self.stderr_regex = Some(Regex::new(&format!("(?m)^{}$", stderr_regex.as_ref())).unwrap());
self self
} }
@ -223,7 +223,7 @@ impl Test {
if let Some(ref stderr_regex) = self.stderr_regex { if let Some(ref stderr_regex) = self.stderr_regex {
if !stderr_regex.is_match(output_stderr) { if !stderr_regex.is_match(output_stderr) {
panic!( panic!(
"Stderr regex mismatch: {} !~= /{}/", "Stderr regex mismatch:\n{:?}\n!~=\n/{:?}/",
output_stderr, stderr_regex output_stderr, stderr_regex
); );
} }