From 2359a25b842578469c3562c37dcf0a7a8e53ffd6 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 11 Aug 2020 09:38:09 +0300 Subject: [PATCH] Fix integration tests EOLs for Windows --- .../tests/integration/build_etcd_manifest/integration_test.go | 3 +++ tests/integration/conversion/integration_test.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/protokube/tests/integration/build_etcd_manifest/integration_test.go b/protokube/tests/integration/build_etcd_manifest/integration_test.go index db13b2ca19..4eb4871a77 100644 --- a/protokube/tests/integration/build_etcd_manifest/integration_test.go +++ b/protokube/tests/integration/build_etcd_manifest/integration_test.go @@ -47,6 +47,9 @@ func TestBuildEtcdManifest(t *testing.T) { rendered := strings.TrimSpace(string(generated)) expected = strings.TrimSpace(expected) + rendered = strings.Replace(rendered, "\r", "", -1) + expected = strings.Replace(expected, "\r", "", -1) + if rendered != expected { diffString := diff.FormatDiff(expected, string(rendered)) t.Logf("diff:\n%s\n", diffString) diff --git a/tests/integration/conversion/integration_test.go b/tests/integration/conversion/integration_test.go index 2fc092e1c7..3f29d4462e 100644 --- a/tests/integration/conversion/integration_test.go +++ b/tests/integration/conversion/integration_test.go @@ -89,6 +89,9 @@ func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string) actualString := strings.TrimSpace(strings.Join(actual, "\n---\n\n")) expectedString := strings.TrimSpace(string(expectedBytes)) + actualString = strings.Replace(actualString, "\r", "", -1) + expectedString = strings.Replace(expectedString, "\r", "", -1) + if actualString != expectedString { diffString := diff.FormatDiff(expectedString, actualString) t.Logf("diff:\n%s\n", diffString)