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: control log level with environment variables #30871

Merged
merged 20 commits into from
Dec 24, 2021
Merged

test: control log level with environment variables #30871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
29b18b3
test: control log level with environment variables
tangenta Dec 20, 2021
11e9a90
clean up code
tangenta Dec 20, 2021
6af0854
util: fix cycle import
tangenta Dec 20, 2021
8341ac7
config: change the test package to config_test
tangenta Dec 20, 2021
5664c3a
address comment
tangenta Dec 20, 2021
fff98a7
make linter happy
tangenta Dec 21, 2021
f716a11
test: ignore goroutine of lumberjack log
Dec 23, 2021
e7c0644
Merge remote-tracking branch 'upstream/master' into log-level
Dec 23, 2021
dd7b8c3
fix table/main_test.go
Dec 23, 2021
1e6df86
test: move workaroundGoCheckFlags to SetupForCommonTest
Dec 23, 2021
0c56f26
Merge remote-tracking branch 'upstream/master' into log-level
tangenta Dec 23, 2021
464a598
test: stablize session/main_test.go
tangenta Dec 23, 2021
5a28135
test: stablize table/tables/main_test.go
tangenta Dec 23, 2021
ad1619d
Merge remote-tracking branch 'upstream/master' into log-level
tangenta Dec 23, 2021
d7f4271
Merge branch 'master' into log-level
tangenta Dec 23, 2021
82fffb3
use the default config instead of global config to initialize log
tangenta Dec 23, 2021
fa3f8a6
try to avoid using lumberjack
tangenta Dec 24, 2021
48d99aa
revert unnecessary changes in config and util
tangenta Dec 24, 2021
af31869
Merge branch 'master' into log-level
ti-chi-bot Dec 24, 2021
3ce6da2
Merge branch 'master' into log-level
ti-chi-bot Dec 24, 2021
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
33 changes: 7 additions & 26 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,24 +136,13 @@ gotest: failpoint-enable
$(GOTEST) -ldflags '$(TEST_LDFLAGS)' $(EXTRA_TEST_ARGS) -timeout 20m -cover $(PACKAGES_TIDB_TESTS) -coverprofile=coverage.txt -check.p true > gotest.log || { $(FAILPOINT_DISABLE); cat 'gotest.log'; exit 1; }
@$(FAILPOINT_DISABLE)

gotest_in_verify_ci_part_1: failpoint-enable tools/bin/gotestsum tools/bin/gocov tools/bin/gocov-xml
tangenta marked this conversation as resolved.
Show resolved Hide resolved
@echo "Running gotest_in_verify_ci_part_1."
gotest_in_verify_ci: failpoint-enable tools/bin/gotestsum
@echo "Running gotest_in_verify_ci"
@mkdir -p $(TEST_COVERAGE_DIR)
@export log_level=info; export TZ='Asia/Shanghai'; \
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/tidb-junit-report.xml" -- -v -p $(P) --race \
-ldflags '$(TEST_LDFLAGS)' $(EXTRA_TEST_ARGS) -coverprofile="$(TEST_COVERAGE_DIR)/tidb_cov.unit_test.out" \
$(PACKAGES_TIDB_TESTS_EXPENSIVE) -check.p true || { $(FAILPOINT_DISABLE); exit 1; }
tools/bin/gocov convert "$(TEST_COVERAGE_DIR)/tidb_cov.unit_test.out" | tools/bin/gocov-xml > "$(TEST_COVERAGE_DIR)/tidb-coverage.xml"
@$(FAILPOINT_DISABLE)

gotest_in_verify_ci_part_2: failpoint-enable tools/bin/gotestsum tools/bin/gocov tools/bin/gocov-xml
@echo "Running gotest_in_verify_ci_part_2."
@mkdir -p $(TEST_COVERAGE_DIR)
@export log_level=info; export TZ='Asia/Shanghai'; \
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/tidb-junit-report.xml" -- -v -p $(P) --race \
@export TZ='Asia/Shanghai'; \
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/tidb-junit-report.xml" -- -v -p $(P) \
-ldflags '$(TEST_LDFLAGS)' $(EXTRA_TEST_ARGS) -coverprofile="$(TEST_COVERAGE_DIR)/tidb_cov.unit_test.out" \
$(PACKAGES_TIDB_TESTS_OTHERS) -check.p true || { $(FAILPOINT_DISABLE); exit 1; }
tools/bin/gocov convert "$(TEST_COVERAGE_DIR)/tidb_cov.unit_test.out" | tools/bin/gocov-xml > "$(TEST_COVERAGE_DIR)/tidb-coverage.xml"
$(PACKAGES_TIDB_TESTS) -check.p true || { $(FAILPOINT_DISABLE); exit 1; }
@$(FAILPOINT_DISABLE)

race: failpoint-enable
Expand Down Expand Up @@ -341,13 +330,12 @@ br_unit_test:
$(GOTEST) $(RACE_FLAG) -ldflags '$(LDFLAGS)' -tags leak $(ARGS) -coverprofile=coverage.txt || ( make failpoint-disable && exit 1 )
@make failpoint-disable
br_unit_test_in_verify_ci: export ARGS=$$($(BR_PACKAGES))
br_unit_test_in_verify_ci: tools/bin/gotestsum tools/bin/gocov tools/bin/gocov-xml
br_unit_test_in_verify_ci: tools/bin/gotestsum
@make failpoint-enable
@export TZ='Asia/Shanghai';
@mkdir -p $(TEST_COVERAGE_DIR)
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/br-junit-report.xml" -- $(RACE_FLAG) -ldflags '$(LDFLAGS)' \
-tags leak $(ARGS) -coverprofile="$(TEST_COVERAGE_DIR)/br_cov.unit_test.out" || ( make failpoint-disable && exit 1 )
tools/bin/gocov convert "$(TEST_COVERAGE_DIR)/br_cov.unit_test.out" | tools/bin/gocov-xml > "$(TEST_COVERAGE_DIR)/br-coverage.xml"
@make failpoint-disable

br_integration_test: br_bins build_br build_for_br_integration_test
Expand Down Expand Up @@ -407,11 +395,10 @@ dumpling_unit_test: failpoint-enable
$(DUMPLING_GOTEST) $(RACE_FLAG) -coverprofile=coverage.txt -covermode=atomic -tags leak $(DUMPLING_ARGS) || ( make failpoint-disable && exit 1 )
@make failpoint-disable
dumpling_unit_test_in_verify_ci: export DUMPLING_ARGS=$$($(DUMPLING_PACKAGES))
dumpling_unit_test_in_verify_ci: failpoint-enable tools/bin/gotestsum tools/bin/gocov tools/bin/gocov-xml
dumpling_unit_test_in_verify_ci: failpoint-enable tools/bin/gotestsum
@mkdir -p $(TEST_COVERAGE_DIR)
CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/dumpling-junit-report.xml" -- -tags leak $(DUMPLING_ARGS) \
$(RACE_FLAG) -coverprofile="$(TEST_COVERAGE_DIR)/dumpling_cov.unit_test.out" || ( make failpoint-disable && exit 1 )
tools/bin/gocov convert "$(TEST_COVERAGE_DIR)/dumpling_cov.unit_test.out" | tools/bin/gocov-xml > "$(TEST_COVERAGE_DIR)/dumpling-coverage.xml"
@make failpoint-disable

dumpling_integration_test: dumpling_bins failpoint-enable build_dumpling
Expand All @@ -435,9 +422,3 @@ dumpling_bins:

tools/bin/gotestsum: tools/check/go.mod
cd tools/check && $(GO) build -o ../bin/gotestsum gotest.tools/gotestsum

tools/bin/gocov: tools/check/go.mod
cd tools/check && $(GO) build -o ../bin/gocov github.com/axw/gocov/gocov

tools/bin/gocov-xml: tools/check/go.mod
cd tools/check && $(GO) build -o ../bin/gocov-xml github.com/AlekSi/gocov-xml
3 changes: 0 additions & 3 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@ MAC := "Darwin"

PACKAGE_LIST := go list ./...
PACKAGE_LIST_TIDB_TESTS := go list ./... | grep -vE "github.com\/pingcap\/tidb\/br|github.com\/pingcap\/tidb\/cmd|github.com\/pingcap\/tidb\/dumpling"
PACKAGE_LIST_TEST_OTHERS := go list ./... | grep -vE "github.com\/pingcap\/tidb\/br|github.com\/pingcap\/tidb\/cmd|github.com\/pingcap\/tidb\/dumpling|github.com\/pingcap\/tidb\/executor|github.com\/pingcap\/tidb\/cmd|github.com\/pingcap\/tidb\/ddl"
PACKAGES ?= $$($(PACKAGE_LIST))
PACKAGES_TIDB_TESTS ?= $$($(PACKAGE_LIST_TIDB_TESTS))
PACKAGES_TIDB_TESTS_EXPENSIVE ?= "github.com/pingcap/tidb/executor" "github.com/pingcap/tidb/ddl"
PACKAGES_TIDB_TESTS_OTHERS ?= $$($(PACKAGE_LIST_TEST_OTHERS))
PACKAGE_DIRECTORIES := $(PACKAGE_LIST) | sed 's|github.com/pingcap/$(PROJECT)/||'
PACKAGE_DIRECTORIES_TIDB_TESTS := $(PACKAGE_LIST_TIDB_TESTS) | sed 's|github.com/pingcap/$(PROJECT)/||'
FILES := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go")
Expand Down
2 changes: 1 addition & 1 deletion bindinfo/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion br/pkg/conn/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ func TestMain(m *testing.M) {
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
}
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m, opts...)
}
2 changes: 1 addition & 1 deletion br/pkg/kv/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion br/pkg/metautil/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ func TestMain(m *testing.M) {
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
}
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m, opts...)
}
2 changes: 1 addition & 1 deletion br/pkg/pdutil/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion br/pkg/rtree/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion br/pkg/summary/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion br/pkg/trace/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion br/pkg/utils/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ func TestMain(m *testing.M) {
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
}
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m, opts...)
}
2 changes: 1 addition & 1 deletion cmd/ddltest/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
err := logutil.InitLogger(&logutil.LogConfig{Config: zaplog.Config{Level: *logLevel}})
if err != nil {
fmt.Fprint(os.Stderr, err.Error())
Expand Down
2 changes: 1 addition & 1 deletion config/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion ddl/failtest/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()

config.UpdateGlobal(func(conf *config.Config) {
conf.TiKVClient.AsyncCommit.SafeWindow = 0
Expand Down
2 changes: 1 addition & 1 deletion ddl/label/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion ddl/util/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
}
Expand Down
2 changes: 1 addition & 1 deletion distsql/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion domain/globalconfigsync/globalconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion domain/infosync/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
}
Expand Down
2 changes: 1 addition & 1 deletion domain/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion errno/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
os.Exit(m.Run())
}
2 changes: 1 addition & 1 deletion executor/aggfuncs/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion executor/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var prepareMergeSuiteData testdata.TestData
var aggMergeSuiteData testdata.TestData

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()

testDataMap.LoadTestSuiteData("testdata", "prepare_suite")
testDataMap.LoadTestSuiteData("testdata", "agg_suite")
Expand Down
2 changes: 1 addition & 1 deletion executor/oomtest/oom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
registerHook()
domain.RunAutoAnalyze = false
config.UpdateGlobal(func(conf *config.Config) {
Expand Down
2 changes: 1 addition & 1 deletion executor/seqtest/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
config.UpdateGlobal(func(conf *config.Config) {
conf.TiKVClient.AsyncCommit.SafeWindow = 0
conf.TiKVClient.AsyncCommit.AllowedClockDrift = 0
Expand Down
2 changes: 1 addition & 1 deletion expression/aggregation/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion expression/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
var testDataMap = make(testdata.BookKeeper)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
testmain.ShortCircuitForBench(m)

config.UpdateGlobal(func(conf *config.Config) {
Expand Down
2 changes: 1 addition & 1 deletion infoschema/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion infoschema/perfschema/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
Expand Down
2 changes: 1 addition & 1 deletion kv/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()

opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
Expand Down
2 changes: 1 addition & 1 deletion meta/autoid/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion meta/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
Expand Down
2 changes: 1 addition & 1 deletion metrics/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion owner/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
opts := []goleak.Option{
goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
}
Expand Down
2 changes: 1 addition & 1 deletion planner/cascades/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var stringerSuiteData testdata.TestData
var transformationRulesSuiteData testdata.TestData

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()

flag.Parse()

Expand Down
2 changes: 1 addition & 1 deletion planner/core/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var testDataMap = make(testdata.BookKeeper, 2)
var indexMergeSuiteData testdata.TestData

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()

flag.Parse()

Expand Down
2 changes: 1 addition & 1 deletion planner/implementation/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion planner/memo/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
2 changes: 1 addition & 1 deletion planner/util/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ import (
)

func TestMain(m *testing.M) {
testbridge.WorkaroundGoCheckFlags()
testbridge.SetupForCommonTest()
goleak.VerifyTestMain(m)
}
Loading