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

Projects
None yet
6 participants
@isbm
Copy link
Contributor

commented Sep 28, 2018

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

@isbm isbm requested a review from saltstack/team-core as a code owner Sep 28, 2018

@salt-jenkins salt-jenkins requested review from saltstack/team-cloud Sep 28, 2018

@isbm isbm changed the title Isbm ipv6 scope errors 2018.3 Bugfix/rework: IPv6 scope errors (bp) Sep 28, 2018

@DmitryKuzmenko
Copy link
Contributor

left a comment

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\'')

This comment has been minimized.

Copy link
@DmitryKuzmenko

DmitryKuzmenko Sep 28, 2018

Contributor

@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\'')

This comment has been minimized.

Copy link
@DmitryKuzmenko

DmitryKuzmenko Sep 28, 2018

Contributor

@skipIf(not ipaddress, ...?

@DmitryKuzmenko
Copy link
Contributor

left a comment

👍

@meaksh

meaksh approved these changes Sep 28, 2018

@rallytime rallytime merged commit fccc08c into saltstack:2018.3 Sep 28, 2018

7 of 8 checks passed

jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@isbm isbm deleted the isbm:isbm-ipv6-scope-errors-2018.3 branch Oct 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.