fix test

Signed-off-by: lance6716 <lance6716@gmail.com>
pingcap · Apr 28, 2022 · 0633576 · 0633576
1 parent 9d2bee4
commit 0633576
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dm/pkg/utils/common.go b/dm/pkg/utils/common.go
@@ -184,12 +184,13 @@ func FetchLowerCaseTableNamesSetting(ctx context.Context, conn *sql.Conn) (Lower
 	return LowerCaseTableNamesFlavor(res), nil
 }
 
-// GetDBCaseSensitive returns the case sensitive setting of target db.
+// GetDBCaseSensitive returns the case-sensitive setting of target db.
 func GetDBCaseSensitive(ctx context.Context, db *sql.DB) (bool, error) {
 	conn, err := db.Conn(ctx)
 	if err != nil {
 		return true, terror.DBErrorAdapt(err, terror.ErrDBDriverError)
 	}
+	defer conn.Close()
 	lcFlavor, err := FetchLowerCaseTableNamesSetting(ctx, conn)
 	if err != nil {
 		return true, err

diff --git a/dm/tests/all_mode/run.sh b/dm/tests/all_mode/run.sh
@@ -96,14 +96,13 @@ function test_query_timeout() {
 	# don't know why CI has turned on Event Scheduler
 	run_sql_both_source 'SET GLOBAL event_scheduler = OFF;'
 
-	# there's only 2 rows in result, one for dm-worker's source-level status, one for SHOW PROCESSLIST
+	# there's only 1 row in result, which is for SHOW PROCESSLIST
 	run_sql_source1 'SHOW PROCESSLIST;'
-	check_rows_equal 2
+	check_rows_equal 1
 
 	run_sql_source2 'SHOW PROCESSLIST;'
-	check_rows_equal 2
+	check_rows_equal 1
 
-	# there's only 1 row in result, which is for SHOW PROCESSLIST
 	run_sql_tidb 'SHOW PROCESSLIST;'
 	check_rows_equal 1