Merge #89772

89772: roachtest: fix gorm test r=ZhouXing19 a=rafiss fixes #89606 fixes #89605 fixes #89729 fixes #89602 This required using the new version and also excluding one of the new test files. Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cockroachdb · Oct 14, 2022 · 4aaf5e9 · 4aaf5e9
2 parents f7340ee + 7722989
commit 4aaf5e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/pkg/cmd/roachtest/tests/gorm.go b/pkg/cmd/roachtest/tests/gorm.go
@@ -24,7 +24,7 @@ import (
 )
 
 var gormReleaseTag = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)$`)
-var gormSupportedTag = "v1.23.8"
+var gormSupportedTag = "v1.24.0"
 
 func registerGORM(r registry.Registry) {
 	runGORM := func(ctx context.Context, t test.Test, c cluster.Cluster) {
@@ -93,10 +93,8 @@ func registerGORM(r registry.Registry) {
 			t.Fatal(err)
 		}
 
-		blocklistName, expectedFailures, ignorelistName, ignoredFailures := gormBlocklists.getLists(version)
-		if expectedFailures == nil {
-			t.Fatalf("No gorm blocklist defined for cockroach version %s", version)
-		}
+		blocklistName, expectedFailures := "gormBlocklist", gormBlocklist
+		ignorelistName, ignoredFailures := "gormIgnorelist", gormIgnorelist
 		t.L().Printf("Running cockroach version %s, using blocklist %s, using ignorelist %s", version, blocklistName, ignorelistName)
 
 		err = c.RunE(ctx, node, `./cockroach sql -e "CREATE DATABASE gorm" --insecure`)
@@ -113,10 +111,14 @@ func registerGORM(r registry.Registry) {
 		t.Status("running gorm test suite and collecting results")
 
 		// Ignore the error as there will be failing tests.
+		// TODO(rafi): migrate_test.go is removed here since it relies on
+		// multi-dimensional arrays, which aren't supported, and leads to a panic in
+		// the test runner.
 		err = c.RunE(
 			ctx,
 			node,
-			fmt.Sprintf(`cd %s && GORM_DIALECT="postgres" GORM_DSN="user=root password= dbname=gorm host=localhost port=26257 sslmode=disable"
+			fmt.Sprintf(`cd %s && rm migrate_test.go &&
+				GORM_DIALECT="postgres" GORM_DSN="user=root password= dbname=gorm host=localhost port=26257 sslmode=disable"
 				go test -v ./... 2>&1 | %s/bin/go-junit-report > %s`,
 				gormTestPath, goPath, resultsPath),
 		)

diff --git a/pkg/cmd/roachtest/tests/gorm_blocklist.go b/pkg/cmd/roachtest/tests/gorm_blocklist.go
@@ -10,30 +10,6 @@
 
 package tests
 
-var gormBlocklists = blocklistsForVersion{
-	{"v20.2", "gormBlocklist20_2", gormBlocklist20_2, "gormIgnorelist20_2", gormIgnorelist20_2},
-	{"v21.1", "gormBlocklist21_1", gormBlocklist21_1, "gormIgnorelist21_1", gormIgnorelist21_1},
-	{"v21.2", "gormBlocklist21_2", gormBlocklist21_2, "gormIgnorelist21_2", gormIgnorelist21_2},
-	{"v22.1", "gormBlocklist22_1", gormBlocklist22_1, "gormIgnorelist22_1", gormIgnorelist22_1},
-	{"v22.2", "gormBlocklist22_2", gormBlocklist22_2, "gormIgnorelist22_2", gormIgnorelist22_2},
-}
+var gormBlocklist = blocklist{}
 
-var gormBlocklist22_2 = gormBlocklist22_1
-
-var gormBlocklist22_1 = gormBlocklist21_2
-
-var gormBlocklist21_2 = gormBlocklist21_1
-
-var gormBlocklist21_1 = gormBlocklist20_2
-
-var gormBlocklist20_2 = blocklist{}
-
-var gormIgnorelist22_2 = gormIgnorelist22_1
-
-var gormIgnorelist22_1 = gormIgnorelist21_2
-
-var gormIgnorelist21_2 = gormIgnorelist21_1
-
-var gormIgnorelist21_1 = gormIgnorelist20_2
-
-var gormIgnorelist20_2 = blocklist{}
+var gormIgnorelist = blocklist{}