Skip to content

bpo-37199: Fix test failures when IPv6 is unavailable or disabled #14480

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

Merged

Conversation

ZackerySpytz
Copy link
Contributor

@ZackerySpytz ZackerySpytz commented Jun 30, 2019

@asvetlov asvetlov merged commit c2cda63 into python:master Jun 30, 2019
@bedevere-bot
Copy link

@asvetlov: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington
Copy link
Contributor

Thanks @ZackerySpytz for the PR, and @asvetlov for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 30, 2019
@bedevere-bot
Copy link

GH-14486 is a backport of this pull request to the 3.8 branch.

miss-islington added a commit that referenced this pull request Jun 30, 2019
@@ -91,6 +91,9 @@ def test_ipaddr_info(self):
self.assertIsNone(
base_events._ipaddr_info('1.2.3.4', 1, UNSPEC, 0, 0))

if not support.IPV6_ENABLED:
return
Copy link
Member

Choose a reason for hiding this comment

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

I don't like this approach, because it's hard to see that the rest of the test is skipped. Please either split the test function into two or move the rest of the code into the if not supported.IPV6_ENABLED block.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay. I am willing to make such changes, but I would like to hear what @asvetlov thinks.

Copy link
Contributor

Choose a reason for hiding this comment

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

@ZackerySpytz please make a PR with changes suggested by @tiran

My first reaction was opening the source code to make sure that the return doesn't make harm.
On the other hand, I've committed the PR as is because you proposed a minimal possible diff.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay. I have created GH-14535.

@miss-islington
Copy link
Contributor

Thanks @ZackerySpytz for the PR, and @asvetlov for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @ZackerySpytz and @asvetlov, I had trouble checking out the 3.7 backport branch.
Please backport using cherry_picker on command line.
cherry_picker c2cda638d63b98f5cf9a8ef13e15aace2b7e3f0b 3.7

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.

6 participants