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.

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

fix a few tests #3897

Merged
merged 2 commits into from
Oct 31, 2019
Merged

Conversation

calebcartwright
Copy link
Member

@calebcartwright calebcartwright commented Oct 29, 2019

This PR fixes a few tests added by me in some recent PRs that were missing some things 😞

Two tests (config::test::test_valid_license_template_path and a system tests for handling ignored files that contain parser errors) were missing the unstable/nightly check, so they were failing on the Travis job that runs on beta: https://travis-ci.com/rust-lang/rustfmt/jobs/250084463

The other test fixed here is one of the tests I added in #3777 that was a little flaky as originally written. This updates the asserts in the test to eliminate that flakiness.

Below job links show the original version failing due to the ordering of the discovered files in the vec
https://travis-ci.com/rust-lang/rustfmt/jobs/250683618
and https://travis-ci.com/rust-lang/rustfmt/jobs/250390989

@calebcartwright calebcartwright changed the title fix test for nested int test file discovery fix a few tests Oct 29, 2019
Copy link
Contributor

@scampi scampi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scampi scampi merged commit 6aec17e into rust-lang:master Oct 31, 2019
@scampi
Copy link
Contributor

scampi commented Oct 31, 2019

Thanks for the fix!

@calebcartwright calebcartwright deleted the fix-test-nested-int-file branch October 31, 2019 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants