From af8ddd665e9210ba2e262b5a1e8709da4fbb05f2 Mon Sep 17 00:00:00 2001 From: Lynn Date: Thu, 11 Jan 2024 10:28:42 +0800 Subject: [PATCH] session: remove some code --- pkg/session/bootstraptest/BUILD.bazel | 2 +- .../bootstraptest/bootstrap_upgrade_test.go | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkg/session/bootstraptest/BUILD.bazel b/pkg/session/bootstraptest/BUILD.bazel index a483ef5977496..4b25d2e72d946 100644 --- a/pkg/session/bootstraptest/BUILD.bazel +++ b/pkg/session/bootstraptest/BUILD.bazel @@ -2,7 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test") go_test( name = "bootstraptest_test", - timeout = "moderate", + timeout = "short", srcs = [ "bootstrap_upgrade_test.go", #keep "main_test.go", diff --git a/pkg/session/bootstraptest/bootstrap_upgrade_test.go b/pkg/session/bootstraptest/bootstrap_upgrade_test.go index fbe12509b94c1..1e7983f09edff 100644 --- a/pkg/session/bootstraptest/bootstrap_upgrade_test.go +++ b/pkg/session/bootstraptest/bootstrap_upgrade_test.go @@ -554,24 +554,6 @@ func TestUpgradeVersionForResumeJob(t *testing.T) { ch := make(chan struct{}) hook := &callback.TestDDLCallback{} var jobID int64 - doOnce := true - hook.OnGetJobBeforeExported = func(str string) { - if jobID == 0 || !doOnce { - return - } - - for i := 0; i < 50; i++ { - sql := fmt.Sprintf("admin show ddl jobs where job_id=%d or job_id=%d", jobID, jobID+1) - se := session.CreateSessionAndSetID(t, store) - rows, err := execute(context.Background(), se, sql) - require.NoError(t, err) - if len(rows) == 2 { - doOnce = false - break - } - time.Sleep(100 * time.Millisecond) - } - } wg := sync.WaitGroup{} wg.Add(1) times := 0