Skip to content

Fix nonconcurrent tests #6900

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 6 commits into from
Jun 7, 2019
Merged

Fix nonconcurrent tests #6900

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04a9a7c
Fix tests when running with RUST_TEST_THREADS=1
May 2, 2019
e157b6d
Fix intermittent test failure due to interleaved stdout
May 2, 2019
a598309
Don't rely on a thread local to uniquely create test roots
May 2, 2019
0e0d968
Update #[test] attribute on all tests in the testsuite
Jun 5, 2019
1e74ea8
Update reamp_path_prefix_ignored to `cargo_test`.
ehuss Jun 7, 2019
a8c22ca
Update to allow publishing cargo-test-macro.
ehuss Jun 7, 2019
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
Next Next commit
Fix tests when running with RUST_TEST_THREADS=1
  • Loading branch information
@ehuss
Jethro Beekman authored and ehuss committed Jun 7, 2019
commit 04a9a7cc346d23d474ea6d41ea6f6f614af38a98
6 changes: 3 additions & 3 deletions tests/testsuite/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ test test_hello ... FAILED
failures:

---- test_hello stdout ----
[..]thread 'test_hello' panicked at 'assertion failed:[..]",
[..]thread '[..]' panicked at 'assertion failed:[..]",
)
.with_stdout_contains("[..]`(left == right)`[..]")
.with_stdout_contains("[..]left: `\"hello\"`,[..]")
Expand Down Expand Up @@ -366,7 +366,7 @@ test test_hello ... FAILED
failures:

---- test_hello stdout ----
[..]thread 'test_hello' panicked at 'assertion failed: false', \
[..]thread '[..]' panicked at 'assertion failed: false', \
tests/footest.rs:1[..]
",
)
Expand Down Expand Up @@ -402,7 +402,7 @@ test test_hello ... FAILED
failures:

---- test_hello stdout ----
[..]thread 'test_hello' panicked at 'assertion failed: false', \
[..]thread '[..]' panicked at 'assertion failed: false', \
src/lib.rs:1[..]
",
)
Expand Down