Skip to content
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

[Goth] Fix nightly #1569

Merged
merged 2 commits into from
Aug 20, 2021
Merged

[Goth] Fix nightly #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b9defb
Revert "workaround for goth being bound to rust stdlib Display impl f…
maaktweluit Jul 12, 2021
e587404
Update log line
maaktweluit Jul 15, 2021
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
2 changes: 1 addition & 1 deletion goth_tests/helpers/probe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ async def wait_for_exeunit_started(self):
async def wait_for_exeunit_finished(self):
"""Wait until exe-unit finishes."""
await self.provider_agent.wait_for_log(
r"(.*)ExeUnit process exited with status Finished - exit code: 0(.*)"
r"(.*)ExeUnit process exited with status Finished - exit status: 0(.*)"
)

@step()
Expand Down
7 changes: 1 addition & 6 deletions utils/process/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@ impl ProcessGroupExt<tokio::process::Command> for tokio::process::Command {
pub enum ExeUnitExitStatus {
#[display(fmt = "Aborted - {}", _0)]
Aborted(std::process::ExitStatus),
// workaround for goth being bound to previous stdlib Display impl for ExitCode
// it was changed recently: https://github.com/rust-lang/rust/commit/11e40ce240d884303bee142a727decaeeef43bdb#diff-7015a38ee6056bbfa832b33281ffeaad5531c4dbfaff60ddfce0934475e040f4R532
#[display(
fmt = "Finished - exit code: {}",
"_0.code().map(|code| format!(\"{}\", code)).unwrap_or(\"None\".into())"
)]
#[display(fmt = "Finished - {}", _0)]
Finished(std::process::ExitStatus),
#[display(fmt = "Error - {}", _0)]
Error(std::io::Error),
Expand Down