Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-22.1: roachtest: upgrade activerecord test #79851

Merged
merged 1 commit into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/tests/activerecord.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

var activerecordResultRegex = regexp.MustCompile(`^(?P<test>[^\s]+#[^\s]+) = (?P<timing>\d+\.\d+ s) = (?P<result>.)$`)
var railsReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)\.?(?P<subpoint>\d*)$`)
var supportedRailsVersion = "6.1"
var supportedRailsVersion = "6.1.5"
var activerecordAdapterVersion = "v6.1.8"

// This test runs activerecord's full test suite against a single cockroach node.
Expand Down
9 changes: 6 additions & 3 deletions pkg/cmd/roachtest/tests/activerecord_blocklist.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ var activeRecordBlockList21_1 = blocklist{}
var activeRecordBlockList20_2 = blocklist{}

var activeRecordIgnoreList22_1 = blocklist{
"CockroachDB::PostgresqlIntervalTest#test_interval_type": "flaky",
"ConcurrentTransactionTest#test_transaction_isolation__read_committed": "flaky - https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/237",
"FixturesTest#test_create_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"IgnoreFixturesTest#test_ignores_books_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
Expand All @@ -45,6 +46,7 @@ var activeRecordIgnoreList22_1 = blocklist{

var activeRecordIgnoreList21_2 = blocklist{
"ActiveRecord::CockroachDB::UnloggedTablesTest#test_gracefully_handles_temporary_tables": "modified to pass on 20.2",
"CockroachDB::PostgresqlIntervalTest#test_interval_type": "flaky",
"ConcurrentTransactionTest#test_transaction_isolation__read_committed": "flaky - https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/237",
"FixturesTest#test_create_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"IgnoreFixturesTest#test_ignores_books_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
Expand All @@ -53,9 +55,10 @@ var activeRecordIgnoreList21_2 = blocklist{

var activeRecordIgnoreList21_1 = blocklist{
"ActiveRecord::CockroachDB::UnloggedTablesTest#test_gracefully_handles_temporary_tables": "modified to pass on 20.2",
"FixturesTest#test_create_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"IgnoreFixturesTest#test_ignores_books_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"IgnoreFixturesTest#test_ignores_parrots_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"CockroachDB::PostgresqlIntervalTest#test_interval_type": "flaky",
"FixturesTest#test_create_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"IgnoreFixturesTest#test_ignores_books_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
"IgnoreFixturesTest#test_ignores_parrots_fixtures": "flaky - FK constraint violated sometimes when loading all fixture data",
}

var activeRecordIgnoreList20_2 = blocklist{
Expand Down