resolve the conflicts

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Mar 22, 2023 · 510a099 · 510a099
1 parent b0cbbcd
commit 510a099
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/tso/client_test.go b/tests/tso/client_test.go
@@ -82,7 +82,7 @@ func (suite *tsoClientTestSuite) SetupSuite() {
 		re.NoError(err)
 	} else {
 		suite.tsoServer, suite.tsoServerCleanup = mcs.StartSingleTSOTestServer(suite.ctx, re, backendEndpoints)
-		suite.client = mcs.SetupTSOClient(suite.ctx, re, strings.Split(backendEndpoints, ","))
+		suite.client = mcs.SetupClientWithKeyspace(suite.ctx, re, strings.Split(backendEndpoints, ","))
 	}
 }