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.

Sign up for GitHub

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

Jump to bottom

Fix logical conflicts in PRs not found by CI #30095

Merged
merged 1 commit into from
Mar 14, 2023
Merged

Fix logical conflicts in PRs not found by CI #30095

merged 1 commit into from
Mar 14, 2023

Conversation

uranusjr
Copy link
Member

Commit c7149c0 (#30009) made _is_setup and _is_teardown permanent attributes, but commit 848a396 (#29891) was merged later against the previous hasattr() style checks. This made main started failing.

This PR fixes the tests, and introduces a few more asserts so things are easier to follow.

@uranusjr
Fix logical conflicts in PRs not found by CI
87a4f92 
Commit c7149c0 made _is_setup and _is_teardown permanent attributes, but
commit 848a396 (PR against a previous commit) still used the previous
hasattr() style checks in tests and started failing main. This fixes the
tests, and introduces a few more asserts so things are easier to follow.
@uranusjr uranusjr mentioned this pull request Mar 14, 2023
Merged
@uranusjr uranusjr merged commit 3152685 into apache:main Mar 14, 2023
@uranusjr uranusjr deleted the fix-is-setup-teardown-failures branch March 14, 2023 10:49
@jedcunningham jedcunningham added the AIP-52 Automatic setup and teardown tasks label Mar 14, 2023
@ephraimbuddy ephraimbuddy added the changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..) label Apr 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@potiuk potiuk potiuk approved these changes

@ephraimbuddy ephraimbuddy Awaiting requested review from ephraimbuddy

@jedcunningham jedcunningham Awaiting requested review from jedcunningham

Assignees
No one assigned
Labels
AIP-52 Automatic setup and teardown tasks changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@uranusjr @potiuk @ephraimbuddy @jedcunningham