Skip to content

roachtest: upgrade activerecord test#79776

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:fix-activerecord
Apr 12, 2022
Merged

roachtest: upgrade activerecord test#79776
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:fix-activerecord

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Apr 11, 2022

fixes #77914

Also updates flaky test list.

Release note: None

Also updates flaky test list.

Release note: None
@rafiss rafiss requested a review from a team April 11, 2022 15:57
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

var activeRecordBlockList20_2 = blocklist{}

var activeRecordIgnoreList22_1 = blocklist{
"CockroachDB::PostgresqlIntervalTest#test_interval_type": "flaky",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uh oh - why o_o

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think the way we override intervalstyle is racy due to this comment:
https://github.com/cockroachdb/activerecord-cockroachdb-adapter/blob/c37e78aeb017933a1a7794c0d00ae7a9562692c7/lib/active_record/connection_adapters/cockroachdb_adapter.rb#L268-L271

hmmmm maybe we should move it back into configure_connection, but just make it handle and ignore an error if the SET fails?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah in future :)

@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 12, 2022

bors r=otan

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 12, 2022

Build succeeded:

@craig craig bot merged commit 4275d52 into cockroachdb:master Apr 12, 2022
@rafiss rafiss deleted the fix-activerecord branch April 12, 2022 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

roachtest: activerecord failed

3 participants