Merge cockroachdb#124344

124344: logictest: skip flaky select_for_update test r=yuzefovich a=yuzefovich Informs: cockroachdb#124197. Epic: None Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
miyamo2 · May 17, 2024 · db5d44d · db5d44d
2 parents 3732a92 + acd12e8
commit db5d44d
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 56 deletions.
diff --git a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go
diff --git a/pkg/cmd/generate-logictest/main.go b/pkg/cmd/generate-logictest/main.go
@@ -202,6 +202,10 @@ func (t *testdir) dump() error {
 		for _, configPaths := range t.logicTestsConfigPaths {
 			paths := configPaths.configPaths[configIdx]
 			for _, file := range paths {
+				if filepath.Base(file) == "select_for_update" {
+					// TODO(#124197): unskip this.
+					continue
+				}
 				dumpTestForFile(f, configPaths.testPrefix, filepath.Base(file), "runLogicTest")
 			}
 		}

diff --git a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go
diff --git a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go
diff --git a/pkg/sql/logictest/tests/fakedist/generated_test.go b/pkg/sql/logictest/tests/fakedist/generated_test.go
diff --git a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go
diff --git a/pkg/sql/logictest/tests/local-mixed-23.2/generated_test.go b/pkg/sql/logictest/tests/local-mixed-23.2/generated_test.go
diff --git a/pkg/sql/logictest/tests/local-vec-off/generated_test.go b/pkg/sql/logictest/tests/local-vec-off/generated_test.go
diff --git a/pkg/sql/logictest/tests/local/generated_test.go b/pkg/sql/logictest/tests/local/generated_test.go