From 3b445dff5e142bb0e620e0ae24ed859ede58d1e4 Mon Sep 17 00:00:00 2001
From: ystaticy <y_static_y@sina.com>
Date: Tue, 14 Feb 2023 17:04:01 +0800
Subject: [PATCH] keyspace: fix keyspace ut (#41375)

close pingcap/tidb#41376
---
 keyspace/BUILD.bazel      |  2 +-
 keyspace/keyspace_test.go | 35 ++++++++++++++---------------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/keyspace/BUILD.bazel b/keyspace/BUILD.bazel
index 534124cb4bb20..e83229c65daa4 100644
--- a/keyspace/BUILD.bazel
+++ b/keyspace/BUILD.bazel
@@ -19,6 +19,6 @@ go_test(
     flaky = True,
     deps = [
         "//config",
-        "@com_github_stretchr_testify//suite",
+        "@com_github_stretchr_testify//require",
     ],
 )
diff --git a/keyspace/keyspace_test.go b/keyspace/keyspace_test.go
index b47366c0527c7..dd27e8f781240 100644
--- a/keyspace/keyspace_test.go
+++ b/keyspace/keyspace_test.go
@@ -18,25 +18,14 @@ import (
 	"testing"
 
 	"github.com/pingcap/tidb/config"
-	"github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/require"
 )
 
-type keyspaceSuite struct {
-	suite.Suite
-}
-
-func TestSetKeyspaceName(t *testing.T) {
-	suite.Run(t, new(keyspaceSuite))
-}
+func TestSetKeyspaceNameInConf(t *testing.T) {
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.KeyspaceName = ""
+	})
 
-func (k *keyspaceSuite) TearDownTest() {
-	// Clear keyspace setting
-	conf := config.GetGlobalConfig()
-	conf.KeyspaceName = ""
-	config.StoreGlobalConfig(conf)
-}
-
-func (k *keyspaceSuite) TestSetKeyspaceNameInConf() {
 	keyspaceNameInCfg := "test_keyspace_cfg"
 
 	// Set KeyspaceName in conf
@@ -47,13 +36,17 @@ func (k *keyspaceSuite) TestSetKeyspaceNameInConf() {
 
 	// Check the keyspaceName which get from GetKeyspaceNameBySettings, equals keyspaceNameInCfg which is in conf.
 	// The cfg.keyspaceName get higher weights than KEYSPACE_NAME in system env.
-	k.Equal(keyspaceNameInCfg, getKeyspaceName)
-	k.Equal(false, IsKeyspaceNameEmpty(getKeyspaceName))
+	require.Equal(t, keyspaceNameInCfg, getKeyspaceName)
+	require.Equal(t, false, IsKeyspaceNameEmpty(getKeyspaceName))
 }
 
-func (k *keyspaceSuite) TestNoKeyspaceNameSet() {
+func TestNoKeyspaceNameSet(t *testing.T) {
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.KeyspaceName = ""
+	})
+
 	getKeyspaceName := GetKeyspaceNameBySettings()
 
-	k.Equal("", getKeyspaceName)
-	k.Equal(true, IsKeyspaceNameEmpty(getKeyspaceName))
+	require.Equal(t, "", getKeyspaceName)
+	require.Equal(t, true, IsKeyspaceNameEmpty(getKeyspaceName))
 }