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

Jump to bottom

ignore CRLF when comparing PEM contents in tests #30

Merged
merged 1 commit into from Mar 5, 2021
Merged

ignore CRLF when comparing PEM contents in tests #30

merged 1 commit into from Mar 5, 2021

Conversation

thomasgl-orange
Copy link
Contributor

@thomasgl-orange thomasgl-orange commented Jun 30, 2020 •
edited

In an other PR, there are tests failing on Windows because of PEM files being written with CR+LF. Which is completely fine I think, but not expected by the unit tests.

This PR fixes these tests, using a convenient AssertJ method for comparing files contents:

assertThat(contentOf(pemFile)).isEqualToNormalizingNewlines(contentOf(EXPECTED_PEM));

@thomasgl-orange thomasgl-orange mentioned this pull request Aug 27, 2020
Merged
jeffret-b
jeffret-b approved these changes Mar 5, 2021
View reviewed changes
Copy link
Contributor

@jeffret-b jeffret-b left a comment

Choose a reason for hiding this comment

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

This looks good.

Thanks for the helpful submission.

@jeffret-b jeffret-b merged commit 6f7d06b into jenkinsci:master Mar 5, 2021
@jeffret-b jeffret-b added the chore label Mar 8, 2021
@dependabot dependabot bot mentioned this pull request Mar 14, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeffret-b jeffret-b jeffret-b approved these changes

Assignees
No one assigned
Labels
chore
Projects
None yet
Milestone
No milestone
2 participants
@thomasgl-orange @jeffret-b