Merge pull request #105759 from cockroachdb/blathers/backport-release…

…-22.2-105745 release-22.2: sql/importer: remove unused skip.WithIssue from TestImportData
cockroachdb · Jun 28, 2023 · 552ade7 · 552ade7
2 parents ab0a84e + 51adaaa
commit 552ade7
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/pkg/sql/importer/import_stmt_test.go b/pkg/sql/importer/import_stmt_test.go
@@ -129,15 +129,14 @@ ORDER BY table_name
 	sqlDB.Exec(t, `SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = true`)
 
 	tests := []struct {
-		name      string
-		create    string
-		with      string
-		typ       string
-		data      string
-		err       string
-		rejected  string
-		query     map[string][][]string
-		skipIssue int
+		name     string
+		create   string
+		with     string
+		typ      string
+		data     string
+		err      string
+		rejected string
+		query    map[string][][]string
 	}{
 		{
 			name: "duplicate unique index key",
@@ -1322,10 +1321,6 @@ COPY public.t (a, b) FROM stdin;
 				}
 			}
 			t.Run(fmt.Sprintf("%s/%s: save_rejected=%v", tc.typ, tc.name, saveRejected), func(t *testing.T) {
-				if tc.skipIssue != 0 {
-					skip.WithIssue(t, tc.skipIssue)
-					return
-				}
 				dbName := fmt.Sprintf("d%d", i)
 				if saveRejected {
 					dbName = dbName + "_save"