Ci: apply testifylint (#171)

youngsofun · web-flow · commit aa1063ee56fc · 2025-09-18T12:10:29.000+08:00
* ci: rm dep github.com/test-go/testify.

* ci: testifylint --fix

* ci: fix warnings.

* ci: testifylint in ci

* ci: fix

* ci: upgrade testify
diff --git a/client_test.go b/client_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql/driver"
 	"encoding/json"
+	"github.com/stretchr/testify/require"
 	"testing"
 
 	"github.com/google/uuid"
@@ -19,11 +20,11 @@ func TestMakeHeadersUserPassword(t *testing.T) {
 		sessionState: &SessionState{Role: "role1"},
 	}
 	headers, err := c.makeHeaders(context.Background())
-	assert.Nil(t, err)
-	assert.Equal(t, headers["Authorization"], []string{"Basic cm9vdDpyb290"})
-	assert.Equal(t, headers["X-Databend-Tenant"], []string{"default"})
+	assert.NoError(t, err)
+	assert.Equal(t, []string{"Basic cm9vdDpyb290"}, headers["Authorization"])
+	assert.Equal(t, []string{"default"}, headers["X-Databend-Tenant"])
 	session := c.getSessionState()
-	assert.Equal(t, session.Role, "role1")
+	assert.Equal(t, "role1", session.Role)
 }
 
 func TestMakeHeadersAccessToken(t *testing.T) {
@@ -35,10 +36,10 @@ func TestMakeHeadersAccessToken(t *testing.T) {
 	}
 	ctx := checkQueryID(context.Background())
 	headers, err := c.makeHeaders(ctx)
-	assert.Nil(t, err)
-	assert.Equal(t, headers["Authorization"], []string{"Bearer abc123"})
-	assert.Equal(t, headers["X-Databend-Tenant"], []string{"tn3ftqihs"})
-	assert.Equal(t, headers["X-Databend-Warehouse"], []string{"small-abc"})
+	assert.NoError(t, err)
+	assert.Equal(t, []string{"Bearer abc123"}, headers["Authorization"])
+	assert.Equal(t, []string{"tn3ftqihs"}, headers["X-Databend-Tenant"])
+	assert.Equal(t, []string{"small-abc"}, headers["X-Databend-Warehouse"])
 	assert.NotEmptyf(t, headers["X-Databend-Query-Id"], "Query ID is not empty")
 }
 
@@ -67,8 +68,8 @@ func TestMakeHeadersQueryID(t *testing.T) {
 	queryId := uuid.NewString()
 	ctx := context.WithValue(context.Background(), ContextKeyQueryID, queryId)
 	headers, err := c.makeHeaders(ctx)
-	assert.Nil(t, err)
-	assert.Equal(t, headers["X-Databend-Query-Id"], []string{queryId})
+	require.NoError(t, err)
+	assert.Equal(t, []string{queryId}, headers["X-Databend-Query-Id"])
 }
 
 func TestDoQuery(t *testing.T) {
@@ -98,6 +99,6 @@ func TestDoQuery(t *testing.T) {
 	ctx := context.WithValue(context.Background(), ContextKeyQueryID, queryId)
 	resp, err := c.StartQuery(ctx, "SELECT 1", []driver.Value{})
 	assert.NoError(t, err)
-	assert.Equal(t, gotQueryID, "mockid1")
+	assert.Equal(t, "mockid1", gotQueryID)
 	assert.Equal(t, resp.ID, queryId)
 }
diff --git a/connection.go b/connection.go
@@ -94,7 +94,7 @@ func (dc *DatabendConn) BeginTx(
 }
 
 func (dc *DatabendConn) cleanup() {
-	dc.rest.Logout(dc.ctx)
+	_ = dc.rest.Logout(dc.ctx)
 	dc.rest = nil
 	dc.cfg = nil
 }
diff --git a/driver.go b/driver.go
@@ -41,5 +41,5 @@ var logger = CreateDefaultLogger()
 
 func init() {
 	sql.Register("databend", DatabendDriver{})
-	logger.SetLogLevel("error")
+	_ = logger.SetLogLevel("error")
 }
diff --git a/dsn_test.go b/dsn_test.go
@@ -15,7 +15,7 @@ func TestParseDSNWithEncodedChars(t *testing.T) {
 	password := "pa$$?word:abc@123"
 	dsn := fmt.Sprintf("databend+https://%s:%s@host:443/db?param1=value1&param2=value2", url.QueryEscape(username), url.QueryEscape(password))
 	cfg, err := ParseDSN(dsn)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, username, cfg.User)
 	assert.Equal(t, password, cfg.Password)
@@ -25,7 +25,7 @@ func TestParseDSNWithEncodedChars(t *testing.T) {
 func TestParseDSNWithSpecialChars(t *testing.T) {
 	dsn := "databend+https://use%#$^&r:pa$$?word@host:443/db?param1=value1&param2=value2"
 	cfg, err := ParseDSN(dsn)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, "use%#$^&r", cfg.User)
 	assert.Equal(t, "pa$$?word", cfg.Password)
@@ -38,7 +38,7 @@ func TestParseDSNWithSpecialChars(t *testing.T) {
 func TestFormatDSN(t *testing.T) {
 	dsn := "databend+https://username:password@tn3ftqihs.ch.aws-us-east-2.default.databend.com/test?role=test_role&empty_field_as=null&timeout=1s&wait_time_secs=10&max_rows_in_buffer=5000000&max_rows_per_page=10000&tls_config=tls-settings&warehouse=wh&sessionParam1=sessionValue1"
 	cfg, err := ParseDSN(dsn)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, "wh", cfg.Warehouse)
 	assert.Equal(t, "tn3ftqihs.ch.aws-us-east-2.default.databend.com:443", cfg.Host)
@@ -53,7 +53,7 @@ func TestFormatDSN(t *testing.T) {
 
 	dsn1 := cfg.FormatDSN()
 	cfg1, err := ParseDSN(dsn1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, cfg, cfg1)
 }
 
@@ -95,7 +95,7 @@ func TestParseDSN(t *testing.T) {
 
 		cfg, err := ParseDSN(dsn)
 		assert.Equal(t, "string", cfg.EmptyFieldAs)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, "/tmp/file1", cfg.AccessTokenFile)
 	})
 
@@ -114,7 +114,7 @@ func TestParseDSN(t *testing.T) {
 
 		for _, test := range tests {
 			cfg, err := ParseDSN(test)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			assert.Equal(t, "username", cfg.User)
 			assert.Equal(t, "password", cfg.Password)
diff --git a/go.mod b/go.mod
@@ -8,8 +8,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
-	github.com/stretchr/testify v1.8.4
-	github.com/test-go/testify v1.1.4
+	github.com/stretchr/testify v1.11.1
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
 )
 
diff --git a/go.sum b/go.sum
@@ -25,8 +25,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/test-go/testify v1.1.4 h1:Tf9lntrKUMHiXQ07qBScBTSA0dhYQlu83hswqelv1iE=
-github.com/test-go/testify v1.1.4/go.mod h1:rH7cfJo/47vWGdi4GPj16x3/t1xGOj2YxzmNQzk2ghU=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
 go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
diff --git a/helpers_test.go b/helpers_test.go
@@ -23,7 +23,7 @@ func TestGetTableFromInsertQuery(t *testing.T) {
 	for i := range wrongArgs {
 		table, err := getTableFromInsertQuery(wrongArgs[i])
 		assert.Error(t, err)
-		assert.Equal(t, "", table)
+		assert.Empty(t, table)
 	}
 }
 
diff --git a/query_test.go b/query_test.go
@@ -17,7 +17,7 @@ func Test_SessionState(t *testing.T) {
 	}
 	buf, err := json.Marshal(ss)
 	require.NoError(t, err)
-	assert.Equal(t, "{\"database\":\"db1\"}", string(buf))
+	assert.JSONEq(t, "{\"database\":\"db1\"}", string(buf))
 
 	buf = []byte(`{"database":"db1", "secondary_roles": []}`)
 	err = json.Unmarshal(buf, ss)
diff --git a/stmt.go b/stmt.go
@@ -7,14 +7,14 @@ import (
 )
 
 type databendStmt struct {
-	dc      *DatabendConn
-	closed  int32
-	prefix  string
-	pattern string
-	index   []int
-	args    [][]driver.Value
-	query   string
-	batch   Batch
+	dc *DatabendConn
+	//closed  int32
+	//prefix  string
+	//pattern string
+	//index   []int
+	//args    [][]driver.Value
+	query string
+	batch Batch
 }
 
 func (stmt *databendStmt) Close() error {
diff --git a/tests/affected_rows_test.go b/tests/affected_rows_test.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"database/sql"
 	"fmt"
+	"github.com/stretchr/testify/require"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -12,17 +13,17 @@ import (
 
 func TestAffectedRows(t *testing.T) {
 	err := selectExec(dsn)
-	assert.NoError(t, err, "select exec failed")
+	require.NoError(t, err, "select exec failed")
 
 	err = createAffectedTable(dsn)
-	assert.NoError(t, err, "create affected table failed")
+	require.NoError(t, err, "create affected table failed")
 	affectedRows, err := updateTable(dsn)
-	assert.NoError(t, err, "update table failed")
-	assert.Equal(t, affectedRows, int64(2))
+	require.NoError(t, err, "update table failed")
+	assert.Equal(t, int64(2), affectedRows)
 
 	affectedRowsDelete, err := deleteTable(dsn)
-	assert.NoError(t, err, "delete table failed")
-	assert.Equal(t, affectedRowsDelete, int64(2))
+	require.NoError(t, err, "delete table failed")
+	assert.Equal(t, int64(2), affectedRowsDelete)
 
 	defer cleanupTable(dsn)
 }
diff --git a/tests/failure_test.go b/tests/failure_test.go
@@ -11,8 +11,8 @@ func TestConnectionError(t *testing.T) {
 	r := require.New(t)
 
 	db, err := sql.Open("databend", "databend://root:123456@localhost:12345")
-	r.Nil(err)
+	r.NoError(err)
 
 	err = db.Ping()
-	r.NotNil(err)
+	r.Error(err)
 }
diff --git a/tests/main_test.go b/tests/main_test.go
@@ -7,12 +7,13 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
-	"github.com/test-go/testify/suite"
+	"github.com/stretchr/testify/suite"
 
 	dc "github.com/datafuselabs/databend-go"
 )
@@ -86,10 +87,11 @@ func (s *DatabendTestSuite) SetupTest() {
 	s.r = require.New(t)
 	db := sql.OpenDB(s.cfg)
 	defer db.Close()
+	tName := strings.ReplaceAll(t.Name(), "/", "__")
 
-	s.table = fmt.Sprintf("test_%s_%d", t.Name(), time.Now().Unix())
+	s.table = fmt.Sprintf("test_%s_%d", tName, time.Now().Unix())
 	// t.Logf("setup test with table %s", s.table)
-	s.table2 = fmt.Sprintf("test_%s_%d", t.Name(), time.Now().Unix()+1)
+	s.table2 = fmt.Sprintf("test_%s_%d", tName, time.Now().Unix()+1)
 
 	_, err := db.Exec(fmt.Sprintf(createTable, s.table))
 	s.r.NoError(err)
@@ -116,9 +118,9 @@ func (s *DatabendTestSuite) TestVersion() {
 	defer db.Close()
 
 	rows, err := db.Query("select version()")
-	s.NoError(err)
+	s.r.NoError(err)
 	result, err := scanValues(rows)
-	s.NoError(err)
+	s.r.NoError(err)
 	s.T().Logf("connected to databend: %s\n", result)
 }
 
diff --git a/tests/nullable_test.go b/tests/nullable_test.go
@@ -41,5 +41,5 @@ func (s *DatabendTestSuite) TestQueryNull() {
 	err = row.Scan(&val)
 	s.r.NoError(err)
 	s.r.False(val.Valid)
-	s.r.Equal("", val.String)
+	s.r.Empty(val.String)
 }
diff --git a/tests/session_test.go b/tests/session_test.go
@@ -39,7 +39,9 @@ func (s *DatabendTestSuite) TestChangeRole() {
 	err := db.QueryRow("select version()").Scan(&result)
 	r.NoError(err)
 	_, err = db.Exec("drop role if exists test_role")
+	r.NoError(err)
 	_, err = db.Exec("drop role if exists test_role_2")
+	r.NoError(err)
 	println(result)
 	_, err = db.Exec("create role if not exists test_role")
 	r.NoError(err)
@@ -56,6 +58,7 @@ func (s *DatabendTestSuite) TestChangeRole() {
 
 	dsn_with_role := fmt.Sprintf("%s&role=test_role", dsn)
 	db2, err := sql.Open("databend", dsn_with_role)
+	r.NoError(err)
 	err = db2.QueryRow("select current_role()").Scan(&result)
 	r.NoError(err)
 	r.Equal("test_role", result)
diff --git a/tests/txn_test.go b/tests/txn_test.go
@@ -23,7 +23,7 @@ func TestTnx(t *testing.T) {
 	assert.NoError(t, err)
 	rows, err := tx1.Query("select 1")
 	assert.NoError(t, err)
-	assert.Equal(t, true, rows.Next())
+	assert.True(t, rows.Next())
 	rows.Close()
 
 	rows2, err := db2.Query(selectT)
@@ -63,7 +63,8 @@ func TestTnx(t *testing.T) {
 	}
 
 	// test rollback
-	db1.Exec("DROP table  t;")
+	_, err = db1.Exec("DROP table  t;")
+	assert.NoError(t, err)
 	_, err = db1.Exec("CREATE OR REPLACE TABLE t(c int);")
 	assert.NoError(t, err)
 	tx1, err = db1.Begin()
diff --git a/tls_config.go b/tls_config.go
@@ -34,11 +34,11 @@ func DeregisterTLSConfig(key string) {
 	tlsConfigLock.Unlock()
 }
 
-func getTLSConfigClone(key string) (config *tls.Config) {
-	tlsConfigLock.RLock()
-	if v, ok := tlsConfigRegistry[key]; ok {
-		config = v.Clone()
-	}
-	tlsConfigLock.RUnlock()
-	return
-}
+//func getTLSConfigClone(key string) (config *tls.Config) {
+//	tlsConfigLock.RLock()
+//	if v, ok := tlsConfigRegistry[key]; ok {
+//		config = v.Clone()
+//	}
+//	tlsConfigLock.RUnlock()
+//	return
+//}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (dc *DatabendConn) BeginTx(`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`func (dc *DatabendConn) cleanup() {`
`97`		`- dc.rest.Logout(dc.ctx)`
	`97`	`+ _ = dc.rest.Logout(dc.ctx)`
`98`	`98`	`dc.rest = nil`
`99`	`99`	`dc.cfg = nil`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ var logger = CreateDefaultLogger()`
`41`	`41`
`42`	`42`	`func init() {`
`43`	`43`	`sql.Register("databend", DatabendDriver{})`
`44`		`- logger.SetLogLevel("error")`
	`44`	`+ _ = logger.SetLogLevel("error")`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ require (`
`8`	`8`	`github.com/google/uuid v1.3.0`
`9`	`9`	`github.com/pkg/errors v0.9.1`
`10`	`10`	`github.com/sirupsen/logrus v1.9.0`
`11`		`- github.com/stretchr/testify v1.8.4`
`12`		`- github.com/test-go/testify v1.1.4`
	`11`	`+ github.com/stretchr/testify v1.11.1`
`13`	`12`	`go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0`
`14`	`13`	`)`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func TestGetTableFromInsertQuery(t *testing.T) {`
`23`	`23`	`for i := range wrongArgs {`
`24`	`24`	`table, err := getTableFromInsertQuery(wrongArgs[i])`
`25`	`25`	`assert.Error(t, err)`
`26`		`- assert.Equal(t, "", table)`
	`26`	`+ assert.Empty(t, table)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func Test_SessionState(t *testing.T) {`
`17`	`17`	`}`
`18`	`18`	`buf, err := json.Marshal(ss)`
`19`	`19`	`require.NoError(t, err)`
`20`		`- assert.Equal(t, "{\"database\":\"db1\"}", string(buf))`
	`20`	`+ assert.JSONEq(t, "{\"database\":\"db1\"}", string(buf))`
`21`	`21`
`22`	`22`	buf = []byte(`{"database":"db1", "secondary_roles": []}`)
`23`	`23`	`err = json.Unmarshal(buf, ss)`