From 8defea25f01a67f46341e47812f1adb24f055152 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Thu, 18 Apr 2024 10:47:07 -0700 Subject: [PATCH 1/3] [chore][receiver/sqlserver] Fix newlines when testing on Windows --- receiver/sqlserverreceiver/queries_test.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/receiver/sqlserverreceiver/queries_test.go b/receiver/sqlserverreceiver/queries_test.go index 515d7c8bbc69e..2d7bc10e6fd90 100644 --- a/receiver/sqlserverreceiver/queries_test.go +++ b/receiver/sqlserverreceiver/queries_test.go @@ -6,19 +6,17 @@ package sqlserverreceiver import ( "os" "path" - "runtime" + "strings" "testing" "github.com/stretchr/testify/require" ) func TestQueryIODBWithoutInstanceName(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Test is failing on Windows, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32519") - } - - expected, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithoutInstanceName.txt")) + expected_bytes, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithoutInstanceName.txt")) require.NoError(t, err) + // Replace all will fix newlines when testing on Windows + expected := strings.ReplaceAll(string(expected_bytes[:]), "\r\n", "\n") actual := getSQLServerDatabaseIOQuery("") @@ -26,12 +24,10 @@ func TestQueryIODBWithoutInstanceName(t *testing.T) { } func TestQueryIODBWithInstanceName(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Test is failing on Windows, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32519") - } - - expected, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithInstanceName.txt")) + expected_bytes, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithInstanceName.txt")) require.NoError(t, err) + // Replace all will fix newlines when testing on Windows + expected := strings.ReplaceAll(string(expected_bytes[:]), "\r\n", "\n") actual := getSQLServerDatabaseIOQuery("instanceName") From 2f5ddb6cf970967082696da9e0446dcf35229f54 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Thu, 18 Apr 2024 10:57:57 -0700 Subject: [PATCH 2/3] Remove unnecessary convert --- receiver/sqlserverreceiver/queries_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/receiver/sqlserverreceiver/queries_test.go b/receiver/sqlserverreceiver/queries_test.go index 2d7bc10e6fd90..a905425edd918 100644 --- a/receiver/sqlserverreceiver/queries_test.go +++ b/receiver/sqlserverreceiver/queries_test.go @@ -20,7 +20,7 @@ func TestQueryIODBWithoutInstanceName(t *testing.T) { actual := getSQLServerDatabaseIOQuery("") - require.Equal(t, string(expected), actual) + require.Equal(t, expected, actual) } func TestQueryIODBWithInstanceName(t *testing.T) { @@ -31,5 +31,5 @@ func TestQueryIODBWithInstanceName(t *testing.T) { actual := getSQLServerDatabaseIOQuery("instanceName") - require.Equal(t, string(expected), actual) + require.Equal(t, expected, actual) } From a18d9bb470456e3862591e6aa5201500fdbad2e6 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Thu, 18 Apr 2024 11:07:54 -0700 Subject: [PATCH 3/3] Fix lint --- receiver/sqlserverreceiver/queries_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/receiver/sqlserverreceiver/queries_test.go b/receiver/sqlserverreceiver/queries_test.go index a905425edd918..139dc410e0391 100644 --- a/receiver/sqlserverreceiver/queries_test.go +++ b/receiver/sqlserverreceiver/queries_test.go @@ -13,10 +13,10 @@ import ( ) func TestQueryIODBWithoutInstanceName(t *testing.T) { - expected_bytes, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithoutInstanceName.txt")) + expectedBytes, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithoutInstanceName.txt")) require.NoError(t, err) // Replace all will fix newlines when testing on Windows - expected := strings.ReplaceAll(string(expected_bytes[:]), "\r\n", "\n") + expected := strings.ReplaceAll(string(expectedBytes), "\r\n", "\n") actual := getSQLServerDatabaseIOQuery("") @@ -24,10 +24,10 @@ func TestQueryIODBWithoutInstanceName(t *testing.T) { } func TestQueryIODBWithInstanceName(t *testing.T) { - expected_bytes, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithInstanceName.txt")) + expectedBytes, err := os.ReadFile(path.Join("./testdata", "databaseIOQueryWithInstanceName.txt")) require.NoError(t, err) // Replace all will fix newlines when testing on Windows - expected := strings.ReplaceAll(string(expected_bytes[:]), "\r\n", "\n") + expected := strings.ReplaceAll(string(expectedBytes), "\r\n", "\n") actual := getSQLServerDatabaseIOQuery("instanceName")