Skip to content

Commit 85effdf

Browse files
committed
*: fix lint errors and remove empty tests
Many of these changes are fixes to lint failures that were found by the recent upgrade to Go 1.25. The others delete empty test packages that serve no purpose (we would otherwise build, link, and run the test binaries, only to actually run no tests). Release note: None Epic: None
1 parent 48e15d6 commit 85effdf

File tree

29 files changed

+25
-168
lines changed

29 files changed

+25
-168
lines changed

pkg/BUILD.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ ALL_TESTS = [
9797
"//pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl:spanconfigsqltranslatorccl_test",
9898
"//pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl:spanconfigsqlwatcherccl_test",
9999
"//pkg/ccl/sqlitelogictestccl/tests/3node-tenant:3node-tenant_test",
100-
"//pkg/ccl/sqlitelogictestccl:sqlitelogictestccl_test",
101100
"//pkg/ccl/sqlproxyccl/acl:acl_test",
102101
"//pkg/ccl/sqlproxyccl/balancer:balancer_test",
103102
"//pkg/ccl/sqlproxyccl/interceptor:interceptor_test",
@@ -120,7 +119,6 @@ ALL_TESTS = [
120119
"//pkg/cli/clisqlexec:clisqlexec_test",
121120
"//pkg/cli/clisqlshell:clisqlshell_test",
122121
"//pkg/cli/democluster:democluster_test",
123-
"//pkg/cli/exit:exit_test",
124122
"//pkg/cli:cli_disallowed_imports_test",
125123
"//pkg/cli:cli_test",
126124
"//pkg/cloud/amazon:amazon_test",
@@ -213,7 +211,6 @@ ALL_TESTS = [
213211
"//pkg/jobs/jobsauth:jobsauth_test",
214212
"//pkg/jobs/jobspb:jobspb_test",
215213
"//pkg/jobs/jobsprofiler:jobsprofiler_test",
216-
"//pkg/jobs/jobsprotectedts:jobsprotectedts_test",
217214
"//pkg/jobs:jobs_test",
218215
"//pkg/keys:keys_test",
219216
"//pkg/keyvisualizer/spanstatsconsumer:spanstatsconsumer_test",
@@ -390,9 +387,7 @@ ALL_TESTS = [
390387
"//pkg/spanconfig/spanconfigkvsubscriber:spanconfigkvsubscriber_test",
391388
"//pkg/spanconfig/spanconfigmanager:spanconfigmanager_test",
392389
"//pkg/spanconfig/spanconfigptsreader:spanconfigptsreader_test",
393-
"//pkg/spanconfig/spanconfigreconciler:spanconfigreconciler_test",
394390
"//pkg/spanconfig/spanconfigreporter:spanconfigreporter_test",
395-
"//pkg/spanconfig/spanconfigsqltranslator:spanconfigsqltranslator_test",
396391
"//pkg/spanconfig/spanconfigsqlwatcher:spanconfigsqlwatcher_test",
397392
"//pkg/spanconfig/spanconfigstore:spanconfigstore_test",
398393
"//pkg/spanconfig/spanconfigtestutils:spanconfigtestutils_test",
@@ -861,7 +856,6 @@ ALL_TESTS = [
861856
"//pkg/workload/workload_generator:workload_generator_test",
862857
"//pkg/workload/workloadimpl:workloadimpl_test",
863858
"//pkg/workload/workloadsql:workloadsql_test",
864-
"//pkg/workload/ycsb:ycsb_test",
865859
"//pkg/workload:workload_test",
866860
]
867861

@@ -1050,7 +1044,6 @@ GO_TARGETS = [
10501044
"//pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl:spanconfigsqlwatcherccl_test",
10511045
"//pkg/ccl/sqlitelogictestccl/tests/3node-tenant:3node-tenant_test",
10521046
"//pkg/ccl/sqlitelogictestccl:sqlitelogictestccl",
1053-
"//pkg/ccl/sqlitelogictestccl:sqlitelogictestccl_test",
10541047
"//pkg/ccl/sqlproxyccl/acl:acl",
10551048
"//pkg/ccl/sqlproxyccl/acl:acl_test",
10561049
"//pkg/ccl/sqlproxyccl/balancer:balancer",
@@ -1105,7 +1098,6 @@ GO_TARGETS = [
11051098
"//pkg/cli/democluster:democluster",
11061099
"//pkg/cli/democluster:democluster_test",
11071100
"//pkg/cli/exit:exit",
1108-
"//pkg/cli/exit:exit_test",
11091101
"//pkg/cli/syncbench:syncbench",
11101102
"//pkg/cli:cli",
11111103
"//pkg/cli:cli_test",
@@ -1435,7 +1427,6 @@ GO_TARGETS = [
14351427
"//pkg/jobs/jobsprofiler:jobsprofiler",
14361428
"//pkg/jobs/jobsprofiler:jobsprofiler_test",
14371429
"//pkg/jobs/jobsprotectedts:jobsprotectedts",
1438-
"//pkg/jobs/jobsprotectedts:jobsprotectedts_test",
14391430
"//pkg/jobs/jobstest:jobstest",
14401431
"//pkg/jobs/metricspoller:metricspoller",
14411432
"//pkg/jobs:jobs",
@@ -1862,12 +1853,10 @@ GO_TARGETS = [
18621853
"//pkg/spanconfig/spanconfigptsreader:spanconfigptsreader",
18631854
"//pkg/spanconfig/spanconfigptsreader:spanconfigptsreader_test",
18641855
"//pkg/spanconfig/spanconfigreconciler:spanconfigreconciler",
1865-
"//pkg/spanconfig/spanconfigreconciler:spanconfigreconciler_test",
18661856
"//pkg/spanconfig/spanconfigreporter:spanconfigreporter",
18671857
"//pkg/spanconfig/spanconfigreporter:spanconfigreporter_test",
18681858
"//pkg/spanconfig/spanconfigsplitter:spanconfigsplitter",
18691859
"//pkg/spanconfig/spanconfigsqltranslator:spanconfigsqltranslator",
1870-
"//pkg/spanconfig/spanconfigsqltranslator:spanconfigsqltranslator_test",
18711860
"//pkg/spanconfig/spanconfigsqlwatcher:spanconfigsqlwatcher",
18721861
"//pkg/spanconfig/spanconfigsqlwatcher:spanconfigsqlwatcher_test",
18731862
"//pkg/spanconfig/spanconfigstore:spanconfigstore",
@@ -2914,7 +2903,6 @@ GO_TARGETS = [
29142903
"//pkg/workload/workloadsql:workloadsql",
29152904
"//pkg/workload/workloadsql:workloadsql_test",
29162905
"//pkg/workload/ycsb:ycsb",
2917-
"//pkg/workload/ycsb:ycsb_test",
29182906
"//pkg/workload:workload",
29192907
"//pkg/workload:workload_test",
29202908
]

pkg/ccl/changefeedccl/schema_registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func gracefulClose(ctx context.Context, toClose io.ReadCloser) {
302302
const respExtraReadLimit = 4096
303303
_, _ = io.CopyN(io.Discard, toClose, respExtraReadLimit)
304304
if err := toClose.Close(); err != nil {
305-
log.Changefeed.VInfof(ctx, 2, "failure to close schema registry connection", err)
305+
log.Changefeed.VInfof(ctx, 2, "failure to close schema registry connection: %+v", err)
306306
}
307307
}
308308

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library")
22

33
go_library(
44
name = "sqlitelogictestccl",
55
srcs = ["doc.go"],
66
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/sqlitelogictestccl",
77
visibility = ["//visibility:public"],
88
)
9-
10-
go_test(
11-
name = "sqlitelogictestccl_test",
12-
size = "small",
13-
srcs = ["doc_test.go"],
14-
data = [
15-
"@com_github_cockroachdb_sqllogictest//:testfiles",
16-
],
17-
embed = [":sqlitelogictestccl"],
18-
)

pkg/ccl/sqlitelogictestccl/doc_test.go

Lines changed: 0 additions & 6 deletions
This file was deleted.

pkg/cli/exit/BUILD.bazel

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library")
22

33
go_library(
44
name = "exit",
@@ -11,10 +11,3 @@ go_library(
1111
visibility = ["//visibility:public"],
1212
deps = ["@com_github_cockroachdb_redact//:redact"],
1313
)
14-
15-
go_test(
16-
name = "exit_test",
17-
size = "small",
18-
srcs = ["codes_test.go"],
19-
embed = [":exit"],
20-
)

pkg/cli/exit/codes_test.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

pkg/cmd/roachprod/cli/commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ The "status" command outputs the binary and PID for the specified nodes:
689689
}
690690
for _, status := range statuses {
691691
if status.Err != nil {
692-
config.Logger.Printf(" %2d: %s %s\n", status.NodeID, status.Err.Error())
692+
config.Logger.Printf(" %2d: %s\n", status.NodeID, status.Err.Error())
693693
} else if !status.Running {
694694
// TODO(irfansharif): Surface the staged version here?
695695
config.Logger.Printf(" %2d: not running\n", status.NodeID)

pkg/cmd/roachtest/tests/admission_control_multitenant_fairness.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func runMultiTenantFairness(
344344
}
345345

346346
ok, maxLatencyDelta := floatsWithinPercentage(meanLatencies, failThreshold)
347-
t.L().Printf("max-latency-delta=%d% mean-latency-per-tenant=%v\n", int(maxLatencyDelta*100), meanLatencies)
347+
t.L().Printf("max-latency-delta=%d%% mean-latency-per-tenant=%v\n", int(maxLatencyDelta*100), meanLatencies)
348348
if !ok {
349349
// TODO(irfansharif): Same as above -- this is a weak assertion.
350350
t.L().Printf("latency not within expectations: %f > %f %v", maxLatencyDelta, failThreshold, meanLatencies)

pkg/cmd/roachtest/tests/allocation_bench.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ func runAllocationBench(
350350
}
351351
samples := make([]*clusterstats.ClusterStatRun, spec.samples)
352352

353-
t.L().Printf("cpu(%) means: average of (max-min) node cpu utilization across intervals")
354-
t.L().Printf("write(%) means: average of (max-min) write disk utilization across intervals")
355-
t.L().Printf("cost(gb) means: GBs sent for rebalancing operations between initial and end")
353+
t.L().Printf("%s", "cpu(%) means: average of (max-min) node cpu utilization across intervals")
354+
t.L().Printf("%s", "write(%) means: average of (max-min) write disk utilization across intervals")
355+
t.L().Printf("%s", "cost(gb) means: GBs sent for rebalancing operations between initial and end")
356356

357357
for i := 0; i < spec.samples; i++ {
358358
statCollector, cleanupFunc := setupAllocationBench(ctx, t, c, spec)

pkg/cmd/roachtest/tests/backup_fixtures.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func (bd *backupDriver) runWorkload(ctx context.Context) (func(), error) {
268268

269269
// scheduleBackups begins the backup schedule.
270270
func (bd *backupDriver) scheduleBackups(ctx context.Context) {
271-
bd.t.L().Printf("creating backup schedule", bd.sp.fixture.WorkloadWarehouses)
271+
bd.t.L().Printf("creating backup schedule %d", bd.sp.fixture.WorkloadWarehouses)
272272
conn := bd.c.Conn(ctx, bd.t.L(), 1)
273273
defer conn.Close()
274274
if bd.sp.fixture.CompactionThreshold > 0 {
@@ -565,7 +565,7 @@ func GetFixtureRegistry(ctx context.Context, t test.Test, cloud spec.Cloud) *blo
565565
case spec.GCE, spec.Local:
566566
account, err := vm.Providers["gce"].FindActiveAccount(t.L())
567567
require.NoError(t, err)
568-
t.L().Printf("using GCE account", account)
568+
t.L().Printf("using GCE account %s", account)
569569

570570
uri = url.URL{
571571
Scheme: "gs",

0 commit comments

Comments
 (0)