From 4311268820561dfe7fee48fb283e7dff747e60c0 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Tue, 11 Aug 2020 12:40:38 -0400 Subject: [PATCH] roachtest: fix regex for django test suite - The release tag regex was too restrictive. - Update SQLAlchemy failure list with new expected fail. Release note: None --- pkg/cmd/roachtest/django.go | 2 +- pkg/cmd/roachtest/sqlalchemy_blocklist.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/roachtest/django.go b/pkg/cmd/roachtest/django.go index dd5e3bbfdf5d..c66a3cb61932 100644 --- a/pkg/cmd/roachtest/django.go +++ b/pkg/cmd/roachtest/django.go @@ -16,7 +16,7 @@ import ( "regexp" ) -var djangoReleaseTagRegex = regexp.MustCompile(`^(?P\d+)\.(?P\d+)\.(?P\d+)$`) +var djangoReleaseTagRegex = regexp.MustCompile(`^(?P\d+)\.(?P\d+)(\.(?P\d+))?$`) var djangoCockroachDBReleaseTagRegex = regexp.MustCompile(`^(?P\d+)\.(?P\d+)$`) var djangoSupportedTag = "3.0.6" diff --git a/pkg/cmd/roachtest/sqlalchemy_blocklist.go b/pkg/cmd/roachtest/sqlalchemy_blocklist.go index e82ca94f6faa..6a2f07824c08 100644 --- 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",