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

merge-queue: embarking main (4cda4ee) and #4942 together #4971

Closed
wants to merge 12 commits into from
Closed

merge-queue: embarking main (4cda4ee) and #4942 together #4971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c0f625
Handle test failure regexes using Result::Err, rather than panicking
teor2345 Aug 24, 2022
04fed99
Add output logs to test context, and add tests for that
teor2345 Aug 24, 2022
39997b8
Let empty test child logs be read again (and produce empty output)
teor2345 Aug 24, 2022
36c6660
Ignore missing test children when killing with ignore_exited
teor2345 Aug 24, 2022
9d4c709
Fix a clippy lint
teor2345 Aug 24, 2022
9006e68
Rename `line` to `line_result` for clarity
teor2345 Aug 24, 2022
ac15152
Revert a redundant context_from() on kill()
teor2345 Aug 24, 2022
23ef673
Only ignore "no such process" kill() errors in sync_until() tests
teor2345 Aug 24, 2022
3eeb3a3
Log the command timeout when an acceptance test fails
teor2345 Aug 26, 2022
b76450e
fix clippy
oxarbitrage Aug 26, 2022
1f72f3a
Merge branch 'main' into show-test-panics
mergify[bot] Aug 28, 2022
751d165
Merge of #4942
mergify[bot] Aug 28, 2022
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions zebra-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ color-eyre = "0.6.1"
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }

humantime = "2.1.0"
owo-colors = "3.4.0"
spandoc = "0.2.2"
thiserror = "1.0.32"

tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
tracing-error = "0.2.0"
tracing = "0.1.31"
Expand Down
Loading