Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix incorrect regexp pattern during migrating test #30080

Merged
merged 11 commits into from
Dec 1, 2021
8 changes: 4 additions & 4 deletions bindinfo/bind_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,11 @@ func TestForbidEvolvePlanBaseLinesBeforeGA(t *testing.T) {
err := tk.ExecToErr("set @@tidb_evolve_plan_baselines=0")
require.Equal(t, nil, err)
err = tk.ExecToErr("set @@TiDB_Evolve_pLan_baselines=1")
require.Regexp(t, "Cannot enable baseline evolution feature, it is not generally available now", err)
require.EqualError(t, err, "Cannot enable baseline evolution feature, it is not generally available now")
err = tk.ExecToErr("set @@TiDB_Evolve_pLan_baselines=oN")
require.Regexp(t, "Cannot enable baseline evolution feature, it is not generally available now", err)
require.EqualError(t, err, "Cannot enable baseline evolution feature, it is not generally available now")
err = tk.ExecToErr("admin evolve bindings")
require.Regexp(t, "Cannot enable baseline evolution feature, it is not generally available now", err)
require.EqualError(t, err, "Cannot enable baseline evolution feature, it is not generally available now")
}

func TestExplainTableStmts(t *testing.T) {
Expand Down Expand Up @@ -861,7 +861,7 @@ func TestSPMWithoutUseDatabase(t *testing.T) {
tk.MustExec("create global binding for select * from t using select * from t force index(a)")

err := tk1.ExecToErr("select * from t")
require.Regexp(t, ".*No database selected", err)
require.Regexp(t, "No database selected$", err)
tk1.MustQuery(`select @@last_plan_from_binding;`).Check(testkit.Rows("0"))
require.True(t, tk1.MustUseIndex("select * from test.t", "a"))
tk1.MustExec("select * from test.t")
Expand Down
8 changes: 4 additions & 4 deletions br/pkg/conn/conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func TestGetAllTiKVStores(t *testing.T) {
{Id: 2, Labels: []*metapb.StoreLabel{{Key: "engine", Value: "tiflash"}}},
},
storeBehavior: ErrorOnTiFlash,
expectedError: "cannot restore to a cluster with active TiFlash stores.*",
expectedError: "^cannot restore to a cluster with active TiFlash stores",
},
{
stores: []*metapb.Store{
Expand All @@ -225,7 +225,7 @@ func TestGetAllTiKVStores(t *testing.T) {
{Id: 6, Labels: []*metapb.StoreLabel{{Key: "else", Value: "tiflash"}, {Key: "engine", Value: "tikv"}}},
},
storeBehavior: ErrorOnTiFlash,
expectedError: "cannot restore to a cluster with active TiFlash stores.*",
expectedError: "^cannot restore to a cluster with active TiFlash stores",
},
{
stores: []*metapb.Store{
Expand Down Expand Up @@ -267,9 +267,9 @@ func TestGetConnOnCanceledContext(t *testing.T) {

_, err := mgr.GetBackupClient(ctx, 42)
require.Error(t, err)
require.Regexp(t, ".*context canceled.*", err.Error())
require.Contains(t, err.Error(), "context canceled")

_, err = mgr.ResetBackupClient(ctx, 42)
require.Error(t, err)
require.Regexp(t, ".*context canceled.*", err.Error())
require.Contains(t, err.Error(), "context canceled")
}
2 changes: 1 addition & 1 deletion br/pkg/gluetikv/glue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ import (

func TestGetVersion(t *testing.T) {
g := Glue{}
require.Regexp(t, "BR(.|\n)*Release Version(.|\n)*Git Commit Hash(.|\n)*", g.GetVersion())
require.Regexp(t, "^BR(.|\n)*Release Version(.|\n)*Git Commit Hash(.|\n)*$", g.GetVersion())
}
8 changes: 4 additions & 4 deletions br/pkg/lightning/backend/backend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func TestWriteEngineFailed(t *testing.T) {
require.NoError(t, err)
err = writer.WriteRows(ctx, nil, rows)
require.Error(t, err)
require.Regexp(t, "fake unrecoverable write error.*", err.Error())
require.Regexp(t, "^fake unrecoverable write error", err.Error())
_, err = writer.Close(ctx)
require.NoError(t, err)
}
Expand Down Expand Up @@ -243,7 +243,7 @@ func TestWriteBatchSendFailedWithRetry(t *testing.T) {
require.NoError(t, err)
err = writer.WriteRows(ctx, nil, rows)
require.Error(t, err)
require.Regexp(t, ".*fake recoverable write batch error", err.Error())
require.Regexp(t, "fake recoverable write batch error$", err.Error())
_, err = writer.Close(ctx)
require.NoError(t, err)
}
Expand All @@ -264,7 +264,7 @@ func TestImportFailedNoRetry(t *testing.T) {
require.NoError(t, err)
err = closedEngine.Import(ctx, 1)
require.Error(t, err)
require.Regexp(t, "fake unrecoverable import error.*", err.Error())
require.Regexp(t, "^fake unrecoverable import error", err.Error())
}

func TestImportFailedWithRetry(t *testing.T) {
Expand All @@ -285,7 +285,7 @@ func TestImportFailedWithRetry(t *testing.T) {
require.NoError(t, err)
err = closedEngine.Import(ctx, 1)
require.Error(t, err)
require.Regexp(t, ".*fake recoverable import error", err.Error())
require.Regexp(t, "fake recoverable import error$", err.Error())
}

func TestImportFailedRecovered(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions br/pkg/lightning/backend/tidb/tidb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func testStrictMode(t *testing.T) {
types.NewStringDatum("\xff\xff\xff\xff"),
}, 1, []int{0, -1, -1}, "5.csv", 0)
require.Error(t, err)
require.Regexp(t, `.*incorrect utf8 value .* for column s0`, err.Error())
require.Regexp(t, `incorrect utf8 value .* for column s0$`, err.Error())

// oepn a new encode because column count changed.
encoder, err = bk.NewEncoder(tbl, &kv.SessionOptions{SQLMode: mysql.ModeStrictAllTables})
Expand All @@ -254,7 +254,7 @@ func testStrictMode(t *testing.T) {
types.NewStringDatum("非 ASCII 字符串"),
}, 1, []int{0, 1, -1}, "6.csv", 0)
require.Error(t, err)
require.Regexp(t, ".*incorrect ascii value .* for column s1", err.Error())
require.Regexp(t, "incorrect ascii value .* for column s1$", err.Error())
}

func TestFetchRemoteTableModels_3_x(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion br/pkg/lightning/lightning_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func TestRun(t *testing.T) {
require.NoError(t, err)
err = lightning.RunOnce(context.Background(), cfg, nil)
require.Error(t, err)
require.Regexp(t, ".*mydumper dir does not exist", err.Error())
require.Regexp(t, "mydumper dir does not exist$", err.Error())

path, _ := filepath.Abs(".")
ctx := context.Background()
Expand Down
6 changes: 3 additions & 3 deletions br/pkg/lightning/lightning_server_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestRunServer(t *testing.T) {
resp, err = http.DefaultClient.Do(req)
require.NoError(t, err)
require.Equal(t, http.StatusMethodNotAllowed, resp.StatusCode)
require.Regexp(t, ".*"+http.MethodPost+".*", resp.Header.Get("Allow"))
require.Contains(t, resp.Header.Get("Allow"), http.MethodPost)
require.NoError(t, resp.Body.Close())

resp, err = http.Post(url, "application/toml", strings.NewReader("????"))
Expand All @@ -101,7 +101,7 @@ func TestRunServer(t *testing.T) {
err = json.NewDecoder(resp.Body).Decode(&data)
require.NoError(t, err)
require.Contains(t, data, "error")
require.Regexp(t, "cannot parse task.*", data["error"])
require.Regexp(t, "^cannot parse task", data["error"])
require.NoError(t, resp.Body.Close())

resp, err = http.Post(url, "application/toml", strings.NewReader("[mydumper.csv]\nseparator = 'fooo'\ndelimiter= 'foo'"))
Expand All @@ -110,7 +110,7 @@ func TestRunServer(t *testing.T) {
err = json.NewDecoder(resp.Body).Decode(&data)
require.NoError(t, err)
require.Contains(t, data, "error")
require.Regexp(t, "invalid task configuration:.*", data["error"])
require.Regexp(t, "^invalid task configuration:", data["error"])
require.NoError(t, resp.Body.Close())

for i := 0; i < 20; i++ {
Expand Down
3 changes: 1 addition & 2 deletions br/pkg/metautil/metafile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package metautil
import (
"context"
"crypto/sha256"
"regexp"
"testing"

"github.com/golang/mock/gomock"
Expand Down Expand Up @@ -87,7 +86,7 @@ func TestWalkMetaFileInvalid(t *testing.T) {
collect := func(m *backuppb.MetaFile) { panic("unreachable") }
err := walkLeafMetaFile(ctx, mockStorage, root, &cipher, collect)

require.Regexp(t, regexp.MustCompile(".*ErrInvalidMetaFile.*"), err)
require.Contains(t, err.Error(), "ErrInvalidMetaFile")
sleepymole marked this conversation as resolved.
Show resolved Hide resolved
}

func TestWalkMetaFile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion br/pkg/pdutil/pd_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestScheduler(t *testing.T) {
}
_, err = pdController.pauseSchedulersAndConfigWith(ctx, []string{}, cfg, mock)
require.Error(t, err)
require.Regexp(t, "^failed to update PD.*", err.Error())
require.Regexp(t, "^failed to update PD", err.Error())
go func() {
<-schedulerPauseCh
}()
Expand Down
2 changes: 1 addition & 1 deletion br/pkg/trace/tracing_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ func TestSpan(t *testing.T) {
// possible result:
// "jobA 22:02:02.545296 20.621764ms\n"
// " └─jobB 22:02:02.545297 10.293444ms\n"
require.Regexp(t, `jobA.*2[0-9]\.[0-9]+ms\n └─jobB.*1[0-9]\.[0-9]+ms\n`, s)
require.Regexp(t, `^jobA.*2[0-9]\.[0-9]+ms\n └─jobB.*1[0-9]\.[0-9]+ms\n$`, s)
}
2 changes: 1 addition & 1 deletion br/pkg/utils/key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func TestParseKey(t *testing.T) {
for _, tt := range testNotSupportKey {
_, err := ParseKey("notSupport", tt.any)
require.Error(t, err)
require.Regexp(t, "unknown format.*", err.Error())
require.Regexp(t, "^unknown format", err.Error())
}
}

Expand Down
2 changes: 1 addition & 1 deletion br/pkg/utils/safe_point_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestCheckGCSafepoint(t *testing.T) {
{
err := utils.CheckGCSafePoint(ctx, pdClient, 0)
require.Error(t, err)
require.Regexp(t, ".*GC safepoint 2333 exceed TS 0.*", err.Error())
require.Contains(t, err.Error(), "GC safepoint 2333 exceed TS 0")
}
}

Expand Down
10 changes: 5 additions & 5 deletions br/pkg/version/build/info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ func TestInfo(t *testing.T) {

info := Info()
lines := strings.Split(info, "\n")
require.Regexp(t, "Release Version.*", lines[0])
require.Regexp(t, "Git Commit Hash.*", lines[1])
require.Regexp(t, "Git Branch.*", lines[2])
require.Regexp(t, "Go Version.*", lines[3])
require.Regexp(t, "UTC Build Time.*", lines[4])
require.Regexp(t, "^Release Version", lines[0])
require.Regexp(t, "^Git Commit Hash", lines[1])
require.Regexp(t, "^Git Branch", lines[2])
require.Regexp(t, "^Go Version", lines[3])
require.Regexp(t, "^UTC Build Time", lines[4])
}

func TestLogInfo(t *testing.T) {
Expand Down
26 changes: 13 additions & 13 deletions br/pkg/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, `incompatible.*version v4.0.0-rc.1, try update it to 4.0.0.*`, err.Error())
require.Regexp(t, `^incompatible.*version v4.0.0-rc.1, try update it to 4.0.0`, err.Error())
}

{
Expand All @@ -62,7 +62,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, `incompatible.*version v3.1.0-beta.1, try update it to 3.1.0.*`, err.Error())
require.Regexp(t, `^incompatible.*version v3.1.0-beta.1, try update it to 3.1.0`, err.Error())
}

{
Expand All @@ -72,7 +72,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, `incompatible.*version v3.0.15, try update it to 3.1.0.*`, err.Error())
require.Regexp(t, `^incompatible.*version v3.0.15, try update it to 3.1.0`, err.Error())
}

{
Expand All @@ -92,7 +92,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, ".*TiKV .* don't support BR, please upgrade cluster .*", err.Error())
require.Regexp(t, "TiKV .* don't support BR, please upgrade cluster ", err.Error())
}

{
Expand All @@ -103,7 +103,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, "TiKV .* mismatch, please .*", err.Error())
require.Regexp(t, "^TiKV .* mismatch, please ", err.Error())
}

{
Expand All @@ -114,7 +114,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, "TiKV .* major version mismatch, please .*", err.Error())
require.Regexp(t, "^TiKV .* major version mismatch, please ", err.Error())
}

{
Expand All @@ -125,7 +125,7 @@ func TestCheckClusterVersion(t *testing.T) {
}
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBR)
require.Error(t, err)
require.Regexp(t, "TiKV .* mismatch, please .*", err.Error())
require.Regexp(t, "^TiKV .* mismatch, please ", err.Error())
}

{
Expand Down Expand Up @@ -246,11 +246,11 @@ func TestExtractTiDBVersion(t *testing.T) {

_, err = ExtractTiDBVersion("")
require.Error(t, err)
require.Regexp(t, "not a valid TiDB version.*", err.Error())
require.Regexp(t, "^not a valid TiDB version", err.Error())

_, err = ExtractTiDBVersion("8.0.12")
require.Error(t, err)
require.Regexp(t, "not a valid TiDB version.*", err.Error())
require.Regexp(t, "^not a valid TiDB version", err.Error())

_, err = ExtractTiDBVersion("not-a-valid-version")
require.Error(t, err)
Expand All @@ -264,15 +264,15 @@ func TestCheckVersion(t *testing.T) {

err = CheckVersion("TiNB", *semver.New("2.1.0"), *semver.New("2.3.5"), *semver.New("3.0.0"))
require.Error(t, err)
require.Regexp(t, "TiNB version too old.*", err.Error())
require.Regexp(t, "^TiNB version too old", err.Error())

err = CheckVersion("TiNB", *semver.New("3.1.0"), *semver.New("2.3.5"), *semver.New("3.0.0"))
require.Error(t, err)
require.Regexp(t, "TiNB version too new.*", err.Error())
require.Regexp(t, "^TiNB version too new", err.Error())

err = CheckVersion("TiNB", *semver.New("3.0.0-beta"), *semver.New("2.3.5"), *semver.New("3.0.0"))
require.Error(t, err)
require.Regexp(t, "TiNB version too new.*", err.Error())
require.Regexp(t, "^TiNB version too new", err.Error())
}

func versionEqualCheck(source *semver.Version, target *semver.Version) (result bool) {
Expand Down Expand Up @@ -398,6 +398,6 @@ Check Table Before Drop: false`

_, err = FetchVersion(ctx, db)
require.Error(t, err)
require.Regexp(t, ".*mock failure", err.Error())
require.Regexp(t, "mock failure$", err.Error())

}
2 changes: 1 addition & 1 deletion ddl/failtest/fail_db_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,6 @@ func TestPartitionAddPanic(t *testing.T) {
_, err := tk.Exec(`alter table t add partition (partition p1 values less than (20));`)
require.Error(t, err)
result := tk.MustQuery("show create table t").Rows()[0][1]
require.Regexp(t, `(?s).*PARTITION .p0. VALUES LESS THAN \(10\).*`, result)
require.Regexp(t, `^(?s).*PARTITION .p0. VALUES LESS THAN \(10\)`, result)
sleepymole marked this conversation as resolved.
Show resolved Hide resolved
require.NotRegexp(t, `(?s).*PARTITION .p0. VALUES LESS THAN \(20\).*`, result)
sleepymole marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion dumpling/export/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestCreateExternalStorage(t *testing.T) {
mockConfig := defaultConfigForTest(t)
loc, err := mockConfig.createExternalStorage(tcontext.Background())
require.NoError(t, err)
require.Regexp(t, "file:.*", loc.URI())
require.Regexp(t, "^file:", loc.URI())
}

func TestMatchMysqlBugVersion(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion dumpling/export/prepare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func TestConfigValidation(t *testing.T) {
conf.FileType = FileFormatSQLTextString
err := adjustFileFormat(conf)
require.Error(t, err)
require.Regexp(t, ".*please unset --filetype or set it to 'csv'.*", err.Error())
require.Contains(t, err.Error(), "please unset --filetype or set it to 'csv'")

conf.FileType = FileFormatCSVString
require.NoError(t, adjustFileFormat(conf))
Expand Down
Loading