Merge #52638

52638: roachtest: fix regex for django test suite r=rafiss a=rafiss - The release tag regex was too restrictive. - Update SQLAlchemy failure list with new expected fail. fixes #52225 fixes #52222 fixes #46800 Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cockroachdb · Aug 11, 2020 · 4da9abd · 4da9abd
2 parents a7c61be + 4311268
commit 4da9abd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/cmd/roachtest/django.go b/pkg/cmd/roachtest/django.go
@@ -16,7 +16,7 @@ import (
 	"regexp"
 )
 
-var djangoReleaseTagRegex = regexp.MustCompile(`^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)$`)
+var djangoReleaseTagRegex = regexp.MustCompile(`^(?P<major>\d+)\.(?P<minor>\d+)(\.(?P<point>\d+))?$`)
 var djangoCockroachDBReleaseTagRegex = regexp.MustCompile(`^(?P<major>\d+)\.(?P<minor>\d+)$`)
 
 var djangoSupportedTag = "3.0.6"

diff --git a/pkg/cmd/roachtest/sqlalchemy_blocklist.go b/pkg/cmd/roachtest/sqlalchemy_blocklist.go
@@ -18,7 +18,9 @@ var sqlAlchemyBlocklists = blocklistsForVersion{
 	{"v20.2", "sqlAlchemyBlocklist20_2", sqlAlchemyBlocklist20_2, "sqlAlchemyIgnoreList20_2", sqlAlchemyIgnoreList20_2},
 }
 
-var sqlAlchemyBlocklist20_2 = blocklist{}
+var sqlAlchemyBlocklist20_2 = blocklist{
+	"test/dialect/test_suite.py::ComponentReflectionTest_cockroachdb+psycopg2_9_5_0::test_get_foreign_keys": "52356",
+}
 
 var sqlAlchemyBlocklist20_1 = blocklist{
 	"test/dialect/test_suite.py::ExpandingBoundInTest_cockroachdb+psycopg2_9_5_0::test_null_in_empty_set_is_false": "41596",