Skip to content

Commit fe03b98

Browse files
authored
Align error message assertion to new missing custom setting error formatting (#1256)
1 parent b576bde commit fe03b98

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

tests/conn_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"os"
2525
"runtime"
2626
"strconv"
27+
"strings"
2728
"sync"
2829
"testing"
2930
"time"
@@ -320,13 +321,13 @@ func TestCustomSettings(t *testing.T) {
320321
require.NoError(t, row.Err())
321322

322323
var setting string
323-
require.NoError(t, row.Scan(&setting))
324-
require.Equal(t, "custom_value", setting)
324+
assert.NoError(t, row.Scan(&setting))
325+
assert.Equal(t, "custom_value", setting)
325326
})
326327

327328
t.Run("get non-existing custom setting value", func(t *testing.T) {
328329
row := conn.QueryRow(context.Background(), "SELECT getSetting('custom_non_existing_setting')")
329-
require.ErrorContains(t, row.Err(), "Unknown setting custom_non_existing_setting")
330+
assert.Contains(t, strings.ReplaceAll(row.Err().Error(), "'", ""), "Unknown setting custom_non_existing_setting")
330331
})
331332

332333
t.Run("get custom setting value from query context", func(t *testing.T) {
@@ -335,11 +336,11 @@ func TestCustomSettings(t *testing.T) {
335336
}))
336337

337338
row := conn.QueryRow(ctx, "SELECT getSetting('custom_query_setting')")
338-
require.NoError(t, row.Err())
339+
assert.NoError(t, row.Err())
339340

340341
var setting string
341-
require.NoError(t, row.Scan(&setting))
342-
require.Equal(t, "custom_query_value", setting)
342+
assert.NoError(t, row.Scan(&setting))
343+
assert.Equal(t, "custom_query_value", setting)
343344
})
344345
}
345346

tests/std/conn_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -430,13 +430,13 @@ func TestCustomSettings(t *testing.T) {
430430
require.NoError(t, row.Err())
431431

432432
var setting string
433-
require.NoError(t, row.Scan(&setting))
434-
require.Equal(t, "custom_value", setting)
433+
assert.NoError(t, row.Scan(&setting))
434+
assert.Equal(t, "custom_value", setting)
435435
})
436436

437437
t.Run("get non-existing custom setting value", func(t *testing.T) {
438438
row := conn.QueryRowContext(context.Background(), "SELECT getSetting('custom_non_existing_setting')")
439-
require.ErrorContains(t, row.Err(), "Unknown setting custom_non_existing_setting")
439+
assert.Contains(t, strings.ReplaceAll(row.Err().Error(), "'", ""), "Unknown setting custom_non_existing_setting")
440440
})
441441

442442
t.Run("get custom setting value from query context", func(t *testing.T) {
@@ -445,11 +445,11 @@ func TestCustomSettings(t *testing.T) {
445445
}))
446446

447447
row := conn.QueryRowContext(ctx, "SELECT getSetting('custom_query_setting')")
448-
require.NoError(t, row.Err())
448+
assert.NoError(t, row.Err())
449449

450450
var setting string
451-
require.NoError(t, row.Scan(&setting))
452-
require.Equal(t, "custom_query_value", setting)
451+
assert.NoError(t, row.Scan(&setting))
452+
assert.Equal(t, "custom_query_value", setting)
453453
})
454454
})
455455
}

0 commit comments

Comments
 (0)