Align error message assertion to new missing custom setting error for…

…matting
ClickHouse · Mar 26, 2024 · 0cb136d · 0cb136d
1 parent b576bde
commit 0cb136d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git 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
@@ -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)
 			})
 		})
 	}