diff --git a/tests/conn_test.go b/tests/conn_test.go index d367bbd55f..d5d2bc29ef 100644 --- a/tests/conn_test.go +++ b/tests/conn_test.go @@ -24,6 +24,7 @@ import ( "os" "runtime" "strconv" + "strings" "sync" "testing" "time" @@ -320,13 +321,13 @@ func TestCustomSettings(t *testing.T) { require.NoError(t, row.Err()) var setting string - require.NoError(t, row.Scan(&setting)) - require.Equal(t, "custom_value", setting) + assert.NoError(t, row.Scan(&setting)) + assert.Equal(t, "custom_value", setting) }) t.Run("get non-existing custom setting value", func(t *testing.T) { row := conn.QueryRow(context.Background(), "SELECT getSetting('custom_non_existing_setting')") - require.ErrorContains(t, row.Err(), "Unknown setting custom_non_existing_setting") + assert.Contains(t, strings.ReplaceAll(row.Err().Error(), "'", ""), "Unknown setting custom_non_existing_setting") }) t.Run("get custom setting value from query context", func(t *testing.T) { @@ -335,11 +336,11 @@ func TestCustomSettings(t *testing.T) { })) row := conn.QueryRow(ctx, "SELECT getSetting('custom_query_setting')") - require.NoError(t, row.Err()) + assert.NoError(t, row.Err()) var setting string - require.NoError(t, row.Scan(&setting)) - require.Equal(t, "custom_query_value", setting) + assert.NoError(t, row.Scan(&setting)) + assert.Equal(t, "custom_query_value", setting) }) } diff --git a/tests/std/conn_test.go b/tests/std/conn_test.go index 35740c766e..96ae2c4b7c 100644 --- a/tests/std/conn_test.go +++ b/tests/std/conn_test.go @@ -430,13 +430,13 @@ func TestCustomSettings(t *testing.T) { require.NoError(t, row.Err()) var setting string - require.NoError(t, row.Scan(&setting)) - require.Equal(t, "custom_value", setting) + assert.NoError(t, row.Scan(&setting)) + assert.Equal(t, "custom_value", setting) }) t.Run("get non-existing custom setting value", func(t *testing.T) { row := conn.QueryRowContext(context.Background(), "SELECT getSetting('custom_non_existing_setting')") - require.ErrorContains(t, row.Err(), "Unknown setting custom_non_existing_setting") + assert.Contains(t, strings.ReplaceAll(row.Err().Error(), "'", ""), "Unknown setting custom_non_existing_setting") }) t.Run("get custom setting value from query context", func(t *testing.T) { @@ -445,11 +445,11 @@ func TestCustomSettings(t *testing.T) { })) row := conn.QueryRowContext(ctx, "SELECT getSetting('custom_query_setting')") - require.NoError(t, row.Err()) + assert.NoError(t, row.Err()) var setting string - require.NoError(t, row.Scan(&setting)) - require.Equal(t, "custom_query_value", setting) + assert.NoError(t, row.Scan(&setting)) + assert.Equal(t, "custom_query_value", setting) }) }) }