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.

Sign up for GitHub

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

Jump to bottom

test: do not overwrite the log config in other tests #31019

Merged
merged 6 commits into from
Jan 14, 2022
Merged

test: do not overwrite the log config in other tests #31019

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e2f6da
test: do not overwrite the log config in other tests
tangenta Dec 24, 2021
d641e64
Merge branch 'master' into fix-log-level
ti-chi-bot Dec 31, 2021
08446f5
Merge branch 'master' into fix-log-level
ti-chi-bot Dec 31, 2021
706a692
Merge branch 'master' into fix-log-level
ti-chi-bot Dec 31, 2021
cc4b7fb
Merge remote-tracking branch 'upstream/master' into fix-log-level
tangenta Jan 14, 2022
771fd4c
Merge branch 'master' into fix-log-level
tangenta Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions server/tidb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import (
"github.com/pingcap/tidb/testkit"
"github.com/pingcap/tidb/util"
"github.com/pingcap/tidb/util/cpuprofile"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tidb/util/plancodec"
"github.com/pingcap/tidb/util/topsql"
"github.com/pingcap/tidb/util/topsql/collector"
Expand Down Expand Up @@ -83,8 +82,6 @@ func createTidbTestSuite(t *testing.T) (*tidbTestSuite, func()) {
cfg.Status.ReportStatus = true
cfg.Status.StatusPort = ts.statusPort
cfg.Performance.TCPKeepAlive = true
err = logutil.InitLogger(cfg.Log.ToLogConfig())
require.NoError(t, err)

server, err := NewServer(cfg, ts.tidbdrv)
require.NoError(t, err)
Expand Down