roachtest: update rust-postgres blocklist

Release note: None
cockroachdb · May 23, 2022 · df545f5 · df545f5
1 parent e6e623f
commit df545f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/pkg/cmd/roachtest/tests/rust_postgres.go b/pkg/cmd/roachtest/tests/rust_postgres.go
@@ -108,10 +108,11 @@ func registerRustPostgres(r registry.Registry) {
 
 		t.Status("building rust postgres (without test)")
 
-		blocklistName, expectedFailures, ignorelistName, ignorelist := rustPostgresBlocklists.getLists(version)
-		if expectedFailures == nil {
-			t.Fatalf("No rust-postgres blocklist defined for cockroach version %s", version)
-		}
+		blocklistName := "rustPostgresBlockList"
+		ignorelistName := "rustPostgresIgnoreList"
+		expectedFailures := rustPostgresBlocklist
+		ignorelist := rustPostgresIgnoreList
+
 		status := fmt.Sprintf("running cockroach version %s, using blocklist %s", version, blocklistName)
 		if ignorelist != nil {
 			status = fmt.Sprintf(

diff --git a/pkg/cmd/roachtest/tests/rust_postgres_blocklist.go b/pkg/cmd/roachtest/tests/rust_postgres_blocklist.go
@@ -10,13 +10,9 @@
 
 package tests
 
-var rustPostgresBlocklists = blocklistsForVersion{
-	{"v22.1", "rustPostgresBlocklist22_1", rustPostgresBlocklist22_1, "rustPostgresIgnoreList22_1", rustPostgresIgnoreList22_1},
-}
-
-var rustPostgresBlocklist22_1 = blocklist{}
+var rustPostgresBlocklist = blocklist{}
 
-var rustPostgresIgnoreList22_1 = blocklist{
+var rustPostgresIgnoreList = blocklist{
 	"binary_copy.read_basic":                "unknown",
 	"binary_copy.read_big_rows":             "unknown",
 	"binary_copy.read_many_rows":            "unknown",