Skip to content

Commit ad7df79

Browse files
authored
br: fix unit test (pingcap#60177)
ref pingcap#59925
1 parent ef44b52 commit ad7df79

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ br_unit_test: export ARGS=$$($(BR_PACKAGES))
452452
br_unit_test:
453453
@make failpoint-enable
454454
@export TZ='Asia/Shanghai';
455-
$(GOTEST) $(RACE_FLAG) -ldflags '$(LDFLAGS)' $(ARGS) -coverprofile=coverage.txt || ( make failpoint-disable && exit 1 )
455+
$(GOTEST) --tags=deadlock,intest $(RACE_FLAG) -ldflags '$(LDFLAGS)' $(ARGS) -coverprofile=coverage.txt || ( make failpoint-disable && exit 1 )
456456
@make failpoint-disable
457457

458458
.PHONY: br_unit_test_in_verify_ci
@@ -461,7 +461,7 @@ br_unit_test_in_verify_ci: tools/bin/gotestsum
461461
@make failpoint-enable
462462
@export TZ='Asia/Shanghai';
463463
@mkdir -p $(TEST_COVERAGE_DIR)
464-
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/br-junit-report.xml" -- $(RACE_FLAG) -ldflags '$(LDFLAGS)' \
464+
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/br-junit-report.xml" -- --tags=deadlock,intest $(RACE_FLAG) -ldflags '$(LDFLAGS)' \
465465
$(ARGS) -coverprofile="$(TEST_COVERAGE_DIR)/br_cov.unit_test.out" || ( make failpoint-disable && exit 1 )
466466
@make failpoint-disable
467467

br/pkg/streamhelper/advancer_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,9 @@ func TestOwnershipLost(t *testing.T) {
918918
c.flushAll()
919919
failpoint.Enable("github.com/pingcap/tidb/br/pkg/streamhelper/subscription.listenOver.aboutToSend", "pause")
920920
failpoint.Enable("github.com/pingcap/tidb/br/pkg/streamhelper/FlushSubscriber.Clear.timeoutMs", "return(500)")
921+
defer func() {
922+
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/br/pkg/streamhelper/FlushSubscriber.Clear.timeoutMs"))
923+
}()
921924
wg := new(sync.WaitGroup)
922925
wg.Add(adv.TEST_registerCallbackForSubscriptions(wg.Done))
923926
cancel()
@@ -939,6 +942,9 @@ func TestSubscriptionPanic(t *testing.T) {
939942

940943
require.NoError(t, adv.OnTick(ctx))
941944
failpoint.Enable("github.com/pingcap/tidb/br/pkg/streamhelper/subscription.listenOver.aboutToSend", "5*panic")
945+
defer func() {
946+
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/br/pkg/streamhelper/subscription.listenOver.aboutToSend"))
947+
}()
942948
ckpt := c.advanceCheckpoints()
943949
c.flushAll()
944950
cnt := 0

br/pkg/version/version_test.go

-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ func TestCheckClusterVersion(t *testing.T) {
5050
mock := mockPDClient{
5151
Client: nil,
5252
}
53-
{
54-
mock.getAllStores = func() []*metapb.Store {
55-
return []*metapb.Store{{Version: `v5.4.2`}}
56-
}
57-
err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBRPiTR)
58-
require.NoError(t, err)
59-
}
6053

6154
{
6255
build.ReleaseVersion = "v6.2.0"

0 commit comments

Comments
 (0)