Skip to content

Commit e6c0508

Browse files
authored
test: fix wrong failpoint.Disable path (#62252)
close #62251
1 parent bd49a62 commit e6c0508

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

dumpling/export/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ go_test(
104104
"//pkg/errno",
105105
"//pkg/meta/metadef",
106106
"//pkg/parser",
107+
"//pkg/testkit/testfailpoint",
107108
"//pkg/util/promutil",
108109
"//pkg/util/table-filter",
109110
"@com_github_coreos_go_semver//semver",
110111
"@com_github_data_dog_go_sqlmock//:go-sqlmock",
111112
"@com_github_go_sql_driver_mysql//:mysql",
112113
"@com_github_pingcap_errors//:errors",
113-
"@com_github_pingcap_failpoint//:failpoint",
114114
"@com_github_prometheus_client_golang//prometheus/collectors",
115115
"@com_github_stretchr_testify//require",
116116
"@org_golang_x_sync//errgroup",

dumpling/export/dump_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"github.com/coreos/go-semver/semver"
1313
"github.com/go-sql-driver/mysql"
1414
"github.com/pingcap/errors"
15-
"github.com/pingcap/failpoint"
1615
"github.com/pingcap/tidb/br/pkg/version"
1716
tcontext "github.com/pingcap/tidb/dumpling/context"
1817
"github.com/pingcap/tidb/pkg/parser"
18+
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
1919
"github.com/pingcap/tidb/pkg/util/promutil"
2020
"github.com/stretchr/testify/require"
2121
"golang.org/x/sync/errgroup"
@@ -311,8 +311,7 @@ func TestSetSessionParams(t *testing.T) {
311311
mock.ExpectExec("SET SESSION tidb_snapshot").
312312
WillReturnError(tikvErr)
313313

314-
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/dumpling/export/SkipResetDB", "return(true)"))
315-
defer failpoint.Disable("github.com/pingcap/tidb/dumpling/export/SkipResetDB=return(true)")
314+
testfailpoint.Enable(t, "github.com/pingcap/tidb/dumpling/export/SkipResetDB", "return(true)")
316315

317316
tctx, cancel := tcontext.Background().WithLogger(appLogger).WithCancel()
318317
defer cancel()

dumpling/export/writer_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"testing"
1212

1313
"github.com/DATA-DOG/go-sqlmock"
14-
"github.com/pingcap/failpoint"
1514
"github.com/pingcap/tidb/br/pkg/version"
1615
tcontext "github.com/pingcap/tidb/dumpling/context"
16+
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
1717
"github.com/pingcap/tidb/pkg/util/promutil"
1818
"github.com/stretchr/testify/require"
1919
)
@@ -73,8 +73,7 @@ func TestWriteTableMeta(t *testing.T) {
7373
require.NoError(t, err)
7474
require.Equal(t, "/*!40014 SET FOREIGN_KEY_CHECKS=0*/;\n/*!40101 SET NAMES binary*/;\nCREATE TABLE t (a INT);\n", string(bytes))
7575

76-
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/dumpling/export/FailToCloseMetaFile", "return(true)"))
77-
defer failpoint.Disable("github.com/pingcap/tidb/dumpling/export/FailToCloseMetaFile=return(true)")
76+
testfailpoint.Enable(t, "github.com/pingcap/tidb/dumpling/export/FailToCloseMetaFile", "return(true)")
7877

7978
err = writer.WriteTableMeta("test", "t", "CREATE TABLE t (a INT)")
8079
require.ErrorContains(t, err, "injected error: fail to close meta file")
@@ -145,8 +144,7 @@ func TestWriteTableData(t *testing.T) {
145144
"(4,'female','sarah@mail.com','020-1235','healthy');\n"
146145
require.Equal(t, expected, string(bytes))
147146

148-
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/dumpling/export/FailToCloseDataFile", "return(true)"))
149-
defer failpoint.Disable("github.com/pingcap/tidb/dumpling/export/FailToCloseDataFile=return(true)")
147+
testfailpoint.Enable(t, "github.com/pingcap/tidb/dumpling/export/FailToCloseDataFile", "return(true)")
150148

151149
tableIR = newMockTableIR("test", "employee", data, specCmts, colTypes)
152150
err = writer.WriteTableData(tableIR, tableIR, 0)

0 commit comments

Comments
 (0)