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

logictest: revert incorrect test assertion update #130453

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

michae2
Copy link
Collaborator

@michae2 michae2 commented Sep 10, 2024

(Deja vu: this is #121556 all over again.)

103bd54 incorrectly updated the test expectations, likely because the --rewrite flag was used on an assertion that has the retry directive.

This commit undoes that change.

Fixes: #130405

Release note: None

(Deja vu: this is cockroachdb#121556 all over again.)

103bd54 incorrectly updated the test expectations, likely because the
`--rewrite` flag was used on an assertion that has the retry directive.

This commit undoes that change.

Fixes: cockroachdb#130405

Release note: None
@michae2 michae2 requested review from rafiss and a team September 10, 2024 21:44
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@mgartner mgartner left a comment

Choose a reason for hiding this comment

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

LGTM. Is there a mechanism we could add that would prevent this in the future? Maybe a lock directive that ignores --rewrite? Then, if the test actually needs to be rewritten, the engineer can temporarily remove lock, run --rewrite, then re-add lock.

@rafiss
Copy link
Collaborator

rafiss commented Sep 18, 2024

gonna go ahead and merge this to address the flake. thanks for the fix!

bors r+

@craig craig bot merged commit 68fc953 into cockroachdb:master Sep 18, 2024
22 of 23 checks passed
@michae2 michae2 deleted the b130405 branch September 26, 2024 17:02
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.

pkg/sql/logictest/tests/fakedist/fakedist_test: TestLogic_zone_config_system_tenant failed
4 participants