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 4 test failures due to broken CRLF line handling on Windows #12381

Merged
merged 2 commits into from
Jul 30, 2020
Merged

Fix 4 test failures due to broken CRLF line handling on Windows #12381

merged 2 commits into from
Jul 30, 2020

Conversation

wrowe
Copy link
Contributor

@wrowe wrowe commented Jul 30, 2020

Commit Message: Fix 4 test failures due to broken CRLF line handling on Windows
Additional Description:

  • test/test_common/environment.cc was reading config files for
    substitution in binary (preserving \r) and then writing the
    substituted resulting file in text (replacing \n with \r\n),
    ending up with \r\r\n line endings.

  • //test/common/runtime:runtime_impl_test now generates multiline
    strings on the fly to ensure line endings are treated in string
    as a binary blob

Co-authored-by: Sunjay Bhatia [email protected]
Co-authored-by: William A Rowe Jr [email protected]
Signed-off-by: Sunjay Bhatia [email protected]
Signed-off-by: William A Rowe Jr [email protected]

Risk Level: Low to Windows, None to Unix
Testing: Local on Windows
Docs Changes: n/a
Release Notes: n/a

sunjayBhatia and others added 2 commits July 30, 2020 13:08
- test/test_common/environment.cc was reading config files for
  substitution in binary (preserving \r) and then writing the
  substituted resulting file in text (replacing \n with \r\n),
  ending up with \r\r\n line endings.

- //test/common/runtime:runtime_impl_test now generates multiline
  strings on the fly to ensure line endings are treated in string
  as a binary blob

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
@sunjayBhatia
Copy link
Member

cc @davinci26 @nigriMSFT

Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thanks!

@mattklein123 mattklein123 merged commit 0186a9f into envoyproxy:master Jul 30, 2020
@wrowe wrowe deleted the fix-yaml-crlf-whitespace branch July 31, 2020 13:55
chaoqin-li1123 pushed a commit to chaoqin-li1123/envoy that referenced this pull request Aug 7, 2020
- test/test_common/environment.cc was reading config files for
  substitution in binary (preserving \r) and then writing the
  substituted resulting file in text (replacing \n with \r\n),
  ending up with \r\r\n line endings.

- //test/common/runtime:runtime_impl_test now generates multiline
  strings on the fly to ensure line endings are treated in string
  as a binary blob

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
chaoqin-li1123 pushed a commit to chaoqin-li1123/envoy that referenced this pull request Aug 7, 2020
- test/test_common/environment.cc was reading config files for
  substitution in binary (preserving \r) and then writing the
  substituted resulting file in text (replacing \n with \r\n),
  ending up with \r\r\n line endings.

- //test/common/runtime:runtime_impl_test now generates multiline
  strings on the fly to ensure line endings are treated in string
  as a binary blob

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
Signed-off-by: chaoqinli <[email protected]>
chaoqin-li1123 pushed a commit to chaoqin-li1123/envoy that referenced this pull request Aug 7, 2020
- test/test_common/environment.cc was reading config files for
  substitution in binary (preserving \r) and then writing the
  substituted resulting file in text (replacing \n with \r\n),
  ending up with \r\r\n line endings.

- //test/common/runtime:runtime_impl_test now generates multiline
  strings on the fly to ensure line endings are treated in string
  as a binary blob

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
Signed-off-by: chaoqinli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants