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

Bugfix/rework: IPv6 scope errors (bp) #49815

Merged
merged 36 commits into from
Sep 28, 2018

Conversation

isbm
Copy link
Contributor

@isbm isbm commented Sep 28, 2018

One-to-one (almost) backport of bugfix, available at #49705

@isbm isbm requested a review from a team as a code owner September 28, 2018 13:50
@ghost ghost requested review from a team September 28, 2018 13:50
@isbm isbm changed the title Isbm ipv6 scope errors 2018.3 Bugfix/rework: IPv6 scope errors (bp) Sep 28, 2018
Copy link
Contributor

@DmitryKuzmenko DmitryKuzmenko left a comment

Choose a reason for hiding this comment

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

Looks good to me except the skipIf in tests, it looks you've reverted the bool logic.

@@ -276,7 +267,7 @@ def test_connect(self):
self.assertDictEqual(network.connect('host', 'port'),
{'comment': ret, 'result': True})

@skipIf(HAS_IPADDRESS is False, 'unable to import \'ipaddress\'')
@skipIf(bool(ipaddress), 'unable to import \'ipaddress\'')
Copy link
Contributor

Choose a reason for hiding this comment

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

@skipIf(not ipaddress, ...?

@@ -288,7 +279,7 @@ def test_is_private(self):
return_value=True):
self.assertTrue(network.is_private('::1'))

@skipIf(HAS_IPADDRESS is False, 'unable to import \'ipaddress\'')
@skipIf(bool(ipaddress), 'unable to import \'ipaddress\'')
Copy link
Contributor

Choose a reason for hiding this comment

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

@skipIf(not ipaddress, ...?

Copy link
Contributor

@DmitryKuzmenko DmitryKuzmenko left a comment

Choose a reason for hiding this comment

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

👍

@rallytime rallytime merged commit fccc08c into saltstack:2018.3 Sep 28, 2018
@isbm isbm deleted the isbm-ipv6-scope-errors-2018.3 branch October 21, 2018 13:53
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