Skip to content

Commit

Permalink
cli: remove useless test skip
Browse files Browse the repository at this point in the history
We had code protecting us against a cli test attempting to start a
tenant but discovering that the binary does not have enough ccl code
linked in to do that. The code was silently skipping the test in this
case. This code is no longer necessary because no test hits it. When it
was introduced, I think there was a ccl test hitting it, but I believe
that went away in cockroachdb#88338. This patch removes the protection.

This patch is part of a larger effort to remove such silent skipping.

Release note: None
Epic: None
  • Loading branch information
andreimatei committed Nov 18, 2022
1 parent 3b802d3 commit 5fa2f8b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion pkg/cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ go_library(
"//pkg/storage/enginepb",
"//pkg/storage/fs",
"//pkg/testutils/serverutils",
"//pkg/testutils/skip",
"//pkg/ts",
"//pkg/ts/tspb",
"//pkg/util",
Expand Down
7 changes: 0 additions & 7 deletions pkg/cli/testutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/server"
"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/errors"
"github.com/kr/pretty"
Expand Down Expand Up @@ -104,12 +103,6 @@ const testUserfileUploadTempDirPrefix = "test-userfile-upload-temp-dir-"
func (c *TestCLI) fail(err error) {
if c.t != nil {
defer c.logScope.Close(c.t)
if strings.Contains(err.Error(), serverutils.RequiresCCLBinaryMessage) {
if c.TestServer != nil {
c.TestServer.Stopper().Stop(context.Background())
}
skip.IgnoreLint(c.t, serverutils.TenantSkipCCLBinaryMessage)
}
c.t.Fatal(err)
} else {
panic(err)
Expand Down

0 comments on commit 5fa2f8b

Please sign in to comment.