From 4b8d95d8dee1070bdf21af006310b0a58e9e2c18 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Mon, 11 Apr 2022 15:56:17 +0000 Subject: [PATCH] roachtest: upgrade activerecord test Also updates flaky test list. Release note: None --- pkg/cmd/roachtest/tests/activerecord.go | 2 +- pkg/cmd/roachtest/tests/activerecord_blocklist.go | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/roachtest/tests/activerecord.go b/pkg/cmd/roachtest/tests/activerecord.go index 874f7052ddbe..188f422b15f2 100644 --- a/pkg/cmd/roachtest/tests/activerecord.go +++ b/pkg/cmd/roachtest/tests/activerecord.go @@ -27,7 +27,7 @@ import ( var activerecordResultRegex = regexp.MustCompile(`^(?P[^\s]+#[^\s]+) = (?P\d+\.\d+ s) = (?P.)$`) var railsReleaseTagRegex = regexp.MustCompile(`^v(?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\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. diff --git a/pkg/cmd/roachtest/tests/activerecord_blocklist.go b/pkg/cmd/roachtest/tests/activerecord_blocklist.go index 8403e2999c80..081cd4ec3209 100644 --- a/pkg/cmd/roachtest/tests/activerecord_blocklist.go +++ b/pkg/cmd/roachtest/tests/activerecord_blocklist.go @@ -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", @@ -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", @@ -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{