Skip to content

Commit 14d91a3

Browse files
committed
tests: wrap failpoint cleanup assertions in defer funcs
Signed-off-by: bufferflies <1045931706@qq.com>
1 parent 53bf48c commit 14d91a3

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

tests/server/apiv2/handlers/tso_keyspace_group_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,13 @@ func (suite *keyspaceGroupTestSuite) TestKeyspaceGroupErrorMessage() {
274274
func (suite *keyspaceGroupTestSuite) TestRemoveKeyspacesFromGroup() {
275275
re := suite.Require()
276276
re.NoError(failpoint.Enable("github.com/tikv/pd/server/delayStartServerLoop", `return(true)`))
277-
defer re.NoError(failpoint.Disable("github.com/tikv/pd/server/delayStartServerLoop"))
277+
defer func() {
278+
re.NoError(failpoint.Disable("github.com/tikv/pd/server/delayStartServerLoop"))
279+
}()
278280
re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/keyspace/skipSplitRegion", "return(true)"))
279-
defer re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/keyspace/skipSplitRegion"))
281+
defer func() {
282+
re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/keyspace/skipSplitRegion"))
283+
}()
280284

281285
keyspaceManager := suite.server.GetKeyspaceManager()
282286
re.NotNil(keyspaceManager)

0 commit comments

Comments
 (0)