diff --git a/pkg/acceptance/cli_test.go b/pkg/acceptance/cli_test.go index d549b84d6f86..2bcaad3f8d36 100644 --- a/pkg/acceptance/cli_test.go +++ b/pkg/acceptance/cli_test.go @@ -23,6 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/acceptance/cluster" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/docker/docker/api/types/container" + "strings" ) const testGlob = "../cli/interactive_tests/test*.tcl" @@ -60,6 +61,10 @@ func TestDockerCLI(t *testing.T) { for _, p := range paths { testFile := filepath.Base(p) testPath := filepath.Join(containerPath, testFile) + if strings.Contains(testPath, "disabled") { + t.Logf("Skipping explicitly disabled test %s", testFile) + continue + } t.Run(testFile, func(t *testing.T) { log.Infof(ctx, "-- starting tests from: %s", testFile) diff --git a/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl b/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl.disabled similarity index 100% rename from pkg/cli/interactive_tests/test_sql_mem_monitor.tcl rename to pkg/cli/interactive_tests/test_sql_mem_monitor.tcl.disabled