Merge pull request #17793 from jordanlewis/disable-mem-monitor-test

acceptance: disable test_sql_mem_monitor
cockroachdb · Aug 22, 2017 · bee419d · bee419d
2 parents 8721da7 + 6f8d3e8
commit bee419d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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/...nteractive_tests/test_sql_mem_monitor.tcl → ...e_tests/test_sql_mem_monitor.tcl.disabled b/...nteractive_tests/test_sql_mem_monitor.tcl → ...e_tests/test_sql_mem_monitor.tcl.disabled