Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Commit 4b6a20a

Browse files
ti-chi-botti-chi-bot
authored
*: migrate test-infra to testify (#344) (#348)
1 parent eeac114 commit 4b6a20a

19 files changed

+993
-793
lines changed

‎Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,10 @@ check:
5050
static: export GO111MODULE=on
5151
static: tools
5252
@ # Not running vet and fmt through metalinter becauase it ends up looking at vendor
53-
tools/bin/gofumports -w -d -format-only -local $(DUMPLING_PKG) $$($(PACKAGE_DIRECTORIES)) 2>&1 | $(CHECKER)
5453
tools/bin/govet --shadow $$($(PACKAGE_DIRECTORIES)) 2>&1 | $(CHECKER)
5554

5655
@# why some lints are disabled?
5756
@# gochecknoglobals - disabled because we do use quite a lot of globals
58-
@# goimports - executed above already, gofumports
5957
@# gofmt - ditto
6058
@# gci - ditto
6159
@# wsl - too pedantic about the formatting
@@ -76,7 +74,6 @@ static: tools
7674
@# sqlclosecheck - the rows in dumpling is created in one function but closed in other functions
7775
CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --deadline 120s \
7876
--disable gochecknoglobals \
79-
--disable goimports \
8077
--disable gofmt \
8178
--disable gci \
8279
--disable wsl \
@@ -97,6 +94,8 @@ static: tools
9794
--disable errorlint \
9895
--disable sqlclosecheck \
9996
--disable scopelint \
97+
--disable gofumpt \
98+
--disable interfacer \
10099
$$($(PACKAGE_DIRECTORIES))
101100
# pingcap/errors APIs are mixed with multiple patterns 'pkg/errors',
102101
# 'juju/errors' and 'pingcap/parser'. To avoid confusion and mistake,

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ require (
2020
github.com/kr/text v0.2.0 // indirect
2121
github.com/mattn/go-runewidth v0.0.10 // indirect
2222
github.com/pingcap/br v4.0.14-0.20210715051733-8afeee8f2859+incompatible
23-
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
2423
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
2524
github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd
2625
github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4
@@ -31,10 +30,12 @@ require (
3130
github.com/prometheus/client_model v0.2.0
3231
github.com/soheilhy/cmux v0.1.4
3332
github.com/spf13/pflag v1.0.5
33+
github.com/stretchr/testify v1.7.0
3434
github.com/tikv/pd v0.0.0-20210105112549-e5be7fd38659
3535
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
3636
github.com/xitongsys/parquet-go v1.6.0 // indirect
3737
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
38+
go.uber.org/goleak v0.10.0
3839
go.uber.org/zap v1.16.0
3940
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
4041
golang.org/x/mod v0.4.2 // indirect

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
527527
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
528528
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
529529
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
530+
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
531+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
530532
github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
531533
github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
532534
github.com/swaggo/http-swagger v0.0.0-20200308142732-58ac5e232fba/go.mod h1:O1lAbCgAAX/KZ80LM/OXwtWFI/5TvZlwxSg8Cq08PV0=
@@ -911,6 +913,8 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
911913
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
912914
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
913915
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
916+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
917+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
914918
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
915919
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
916920
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎tools/Makefile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
all: bin/gofumports bin/govet bin/revive bin/golangci-lint bin/failpoint-ctl
2-
3-
bin/gofumports:
4-
go build -o $@ mvdan.cc/gofumpt/gofumports
1+
all: bin/govet bin/revive bin/golangci-lint bin/failpoint-ctl
52

63
bin/govet:
74
go build -o $@ github.com/dnephin/govet

‎tools/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ require (
77
github.com/golangci/golangci-lint v1.33.0
88
github.com/mgechev/revive v1.0.2
99
github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
10-
mvdan.cc/gofumpt v0.0.0-20201123090407-3077abae40c0
1110
)

‎tools/go.sum‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
151151
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
152152
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
153153
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
154+
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
154155
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
155-
github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
156-
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
157156
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
158157
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
159158
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -335,8 +334,6 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
335334
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
336335
github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
337336
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
338-
github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0=
339-
github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
340337
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
341338
github.com/ryancurrah/gomodguard v1.1.0 h1:DWbye9KyMgytn8uYpuHkwf0RHqAYO6Ay/D0TbCpPtVU=
342339
github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM=
@@ -476,9 +473,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
476473
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
477474
golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
478475
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
476+
golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
479477
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
480-
golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
481-
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
482478
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
483479
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
484480
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -489,7 +485,6 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
489485
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
490486
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
491487
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
492-
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
493488
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
494489
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
495490
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -515,14 +510,12 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
515510
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
516511
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
517512
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
518-
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
519513
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
520514
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
521515
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
522516
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
517+
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
523518
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
524-
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
525-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
526519
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
527520
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
528521
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -570,9 +563,8 @@ golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4X
570563
golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
571564
golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
572565
golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
566+
golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752 h1:2ntEwh02rqo2jSsrYmp4yKHHjh0CbXP3ZtSUetSB+q8=
573567
golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
574-
golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb h1:z5+u0pkAUPUWd3taoTialQ2JAMo4Wo1Z3L25U4ZV9r0=
575-
golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
576568
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
577569
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
578570
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -611,7 +603,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
611603
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
612604
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
613605
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
614-
gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
615606
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
616607
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
617608
gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
@@ -635,9 +626,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
635626
honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc=
636627
honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY=
637628
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
629+
mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d h1:t8TAw9WgTLghti7RYkpPmqk4JtQ3+wcP5GgZqgWeWLQ=
638630
mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d/go.mod h1:bzrjFmaD6+xqohD3KYP0H2FEuxknnBmyyOxdhLdaIws=
639-
mvdan.cc/gofumpt v0.0.0-20201123090407-3077abae40c0 h1:kQ90sSvDP83HYKOsmrpDtcKkbWPjWYL2LmSCz1oE6vE=
640-
mvdan.cc/gofumpt v0.0.0-20201123090407-3077abae40c0/go.mod h1:E4LOcu9JQEtnYXtB1Y51drqh2Qr2Ngk9J3YrRCwcbd0=
641631
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
642632
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
643633
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=

‎tools/go_mod_guard.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ import (
1414

1515
// failpoint enables manual 'failure' of some execution points.
1616
_ "github.com/pingcap/failpoint"
17-
18-
// A stricter gofmt
19-
_ "mvdan.cc/gofumpt/gofumports"
17+
_ "github.com/pingcap/failpoint/code"
2018
)

‎v4/export/block_allow_list_test.go‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ package export
44

55
import (
66
"strings"
7+
"testing"
78

89
tcontext "github.com/pingcap/dumpling/v4/context"
9-
10-
. "github.com/pingcap/check"
1110
"github.com/pingcap/tidb-tools/pkg/filter"
1211
tf "github.com/pingcap/tidb-tools/pkg/table-filter"
12+
"github.com/stretchr/testify/require"
1313
)
1414

15-
var _ = Suite(&testBWListSuite{})
16-
17-
type testBWListSuite struct{}
15+
func TestFilterTables(t *testing.T) {
16+
t.Parallel()
1817

19-
func (s *testBWListSuite) TestFilterTables(c *C) {
2018
tctx := tcontext.Background().WithLogger(appLogger)
2119
dbTables := DatabaseTables{}
2220
expectedDBTables := DatabaseTables{}
@@ -28,26 +26,29 @@ func (s *testBWListSuite) TestFilterTables(c *C) {
2826
dbTables.AppendTables("yyy", []string{"xxx"}, []uint64{0})
2927

3028
tableFilter, err := tf.Parse([]string{"*.*"})
31-
c.Assert(err, IsNil)
29+
require.NoError(t, err)
30+
3231
conf := &Config{
3332
ServerInfo: ServerInfo{
3433
ServerType: ServerTypeTiDB,
3534
},
3635
Tables: dbTables,
3736
TableFilter: tableFilter,
3837
}
39-
4038
databases := []string{filter.InformationSchemaName, filter.PerformanceSchemaName, "xxx", "yyy"}
41-
c.Assert(filterDatabases(tctx, conf, databases), DeepEquals, databases)
39+
require.Equal(t, databases, filterDatabases(tctx, conf, databases))
4240

4341
conf.TableFilter = tf.NewSchemasFilter("xxx")
44-
c.Assert(filterDatabases(tctx, conf, databases), DeepEquals, []string{"xxx"})
42+
require.Equal(t, []string{"xxx"}, filterDatabases(tctx, conf, databases))
43+
4544
filterTables(tcontext.Background(), conf)
46-
c.Assert(conf.Tables, HasLen, 1)
47-
c.Assert(conf.Tables, DeepEquals, expectedDBTables)
45+
require.Len(t, conf.Tables, 1)
46+
require.Equal(t, expectedDBTables, conf.Tables)
4847
}
4948

50-
func (s *testBWListSuite) TestFilterDatabaseWithNoTable(c *C) {
49+
func TestFilterDatabaseWithNoTable(t *testing.T) {
50+
t.Parallel()
51+
5152
dbTables := DatabaseTables{}
5253
expectedDBTables := DatabaseTables{}
5354

@@ -61,21 +62,21 @@ func (s *testBWListSuite) TestFilterDatabaseWithNoTable(c *C) {
6162
DumpEmptyDatabase: true,
6263
}
6364
filterTables(tcontext.Background(), conf)
64-
c.Assert(conf.Tables, HasLen, 0)
65+
require.Len(t, conf.Tables, 0)
6566

6667
dbTables["xxx"] = []*TableInfo{}
6768
expectedDBTables["xxx"] = []*TableInfo{}
6869
conf.Tables = dbTables
6970
conf.TableFilter = tf.NewSchemasFilter("xxx")
7071
filterTables(tcontext.Background(), conf)
71-
c.Assert(conf.Tables, HasLen, 1)
72-
c.Assert(conf.Tables, DeepEquals, expectedDBTables)
72+
require.Len(t, conf.Tables, 1)
73+
require.Equal(t, expectedDBTables, conf.Tables)
7374

7475
dbTables["xxx"] = []*TableInfo{}
7576
expectedDBTables = DatabaseTables{}
7677
conf.Tables = dbTables
7778
conf.DumpEmptyDatabase = false
7879
filterTables(tcontext.Background(), conf)
79-
c.Assert(conf.Tables, HasLen, 0)
80-
c.Assert(conf.Tables, DeepEquals, expectedDBTables)
80+
require.Len(t, conf.Tables, 0)
81+
require.Equal(t, expectedDBTables, conf.Tables)
8182
}

‎v4/export/config_test.go‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@
33
package export
44

55
import (
6-
tcontext "github.com/pingcap/dumpling/v4/context"
6+
"testing"
77

8-
. "github.com/pingcap/check"
8+
tcontext "github.com/pingcap/dumpling/v4/context"
9+
"github.com/stretchr/testify/require"
910
)
1011

11-
var _ = Suite(&testConfigSuite{})
12-
13-
type testConfigSuite struct{}
14-
15-
func (s *testConfigSuite) TestCreateExternalStorage(c *C) {
16-
mockConfig := defaultConfigForTest(c)
12+
func TestCreateExternalStorage(t *testing.T) {
13+
t.Parallel()
14+
mockConfig := defaultConfigForTest(t)
1715
loc, err := mockConfig.createExternalStorage(tcontext.Background())
18-
c.Assert(err, IsNil)
19-
c.Assert(loc.URI(), Matches, "file:.*")
16+
require.NoError(t, err)
17+
require.Regexp(t, "file:.*", loc.URI())
2018
}
2119

22-
func (s *testConfigSuite) TestMatchMysqlBugversion(c *C) {
20+
func TestMatchMysqlBugVersion(t *testing.T) {
2321
cases := []struct {
2422
serverInfo ServerInfo
2523
expected bool
@@ -31,7 +29,6 @@ func (s *testConfigSuite) TestMatchMysqlBugversion(c *C) {
3129
{ParseServerInfo(tcontext.Background(), "8.0.23"), false},
3230
}
3331
for _, x := range cases {
34-
cmt := Commentf("server info %s", x.serverInfo)
35-
c.Assert(x.expected, Equals, matchMysqlBugversion(x.serverInfo), cmt)
32+
require.Equalf(t, matchMysqlBugversion(x.serverInfo), x.expected, "server info: %s", x.serverInfo)
3633
}
3734
}

0 commit comments

Comments
 (0)