Skip to content

fix: Only exit peacefully when all failures are overwritten #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2023
Merged

fix: Only exit peacefully when all failures are overwritten #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ impl Runner {
})
.collect();

if !failures.is_empty() && mode != &Mode::Overwrite {
if !failures.is_empty() {
let stderr = std::io::stderr();
let mut stderr = stderr.lock();
let _ = writeln!(
Expand Down Expand Up @@ -236,15 +236,19 @@ impl Case {
}
Mode::Overwrite => {
// `rev()` to ensure we don't mess up our line number info
for output in outputs.iter().rev() {
if let Err(output) = output {
let _ = sequence.overwrite(
for step_status in outputs.iter_mut().rev() {
if let Err(output) = step_status {
let res = sequence.overwrite(
&self.path,
output.id.as_deref(),
output.stdout.as_ref().map(|s| &s.content),
output.stderr.as_ref().map(|s| &s.content),
output.spawn.exit,
);

if res.is_ok() {
*step_status = Ok(output.clone());
}
}
}
}
Expand Down