File tree 3 files changed +8
-9
lines changed
3 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -452,7 +452,7 @@ br_unit_test: export ARGS=$$($(BR_PACKAGES))
452
452
br_unit_test :
453
453
@make failpoint-enable
454
454
@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 )
456
456
@make failpoint-disable
457
457
458
458
.PHONY : br_unit_test_in_verify_ci
@@ -461,7 +461,7 @@ br_unit_test_in_verify_ci: tools/bin/gotestsum
461
461
@make failpoint-enable
462
462
@export TZ=' Asia/Shanghai' ;
463
463
@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)' \
465
465
$(ARGS ) -coverprofile=" $( TEST_COVERAGE_DIR) /br_cov.unit_test.out" || ( make failpoint-disable && exit 1 )
466
466
@make failpoint-disable
467
467
Original file line number Diff line number Diff line change @@ -918,6 +918,9 @@ func TestOwnershipLost(t *testing.T) {
918
918
c .flushAll ()
919
919
failpoint .Enable ("github.com/pingcap/tidb/br/pkg/streamhelper/subscription.listenOver.aboutToSend" , "pause" )
920
920
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
+ }()
921
924
wg := new (sync.WaitGroup )
922
925
wg .Add (adv .TEST_registerCallbackForSubscriptions (wg .Done ))
923
926
cancel ()
@@ -939,6 +942,9 @@ func TestSubscriptionPanic(t *testing.T) {
939
942
940
943
require .NoError (t , adv .OnTick (ctx ))
941
944
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
+ }()
942
948
ckpt := c .advanceCheckpoints ()
943
949
c .flushAll ()
944
950
cnt := 0
Original file line number Diff line number Diff line change @@ -50,13 +50,6 @@ func TestCheckClusterVersion(t *testing.T) {
50
50
mock := mockPDClient {
51
51
Client : nil ,
52
52
}
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
- }
60
53
61
54
{
62
55
build .ReleaseVersion = "v6.2.0"
You can’t perform that action at this time.
0 commit comments