diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2019-10-24 18:38:56 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2019-10-24 18:38:56 -0700 |
| commit | 9ce861fb487ea876ea2b732902dfe78e608d41fb (patch) | |
| tree | 6534cf515c4c329d687714fe0332e47a9a6cbcc8 /app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch | |
| parent | dev-qt/qtwebengine: Fix build against ICU-65 (diff) | |
| download | gentoo-9ce861fb487ea876ea2b732902dfe78e608d41fb.tar.gz gentoo-9ce861fb487ea876ea2b732902dfe78e608d41fb.tar.bz2 gentoo-9ce861fb487ea876ea2b732902dfe78e608d41fb.zip | |
app-admin/salt: Version bump to 2019.2.2
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch')
| -rw-r--r-- | app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch b/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch new file mode 100644 index 000000000000..8d28fe7f16a6 --- /dev/null +++ b/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch @@ -0,0 +1,28 @@ +diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py +index af5cbbab2b..15236c127a 100644 +--- a/tests/unit/utils/test_network.py ++++ b/tests/unit/utils/test_network.py +@@ -1,6 +1,7 @@ + # -*- coding: utf-8 -*- + # Import Python libs + from __future__ import absolute_import, unicode_literals, print_function ++import sys + import logging + import socket + import textwrap +@@ -249,6 +250,7 @@ class NetworkTestCase(TestCase): + log.error('bad host_port value: "%s" failed to trigger ValueError exception', host_port) + raise _e_ + ++ @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323") + def test_dns_check(self): + hosts = [ + {'host': '10.10.0.3', +@@ -302,6 +304,7 @@ class NetworkTestCase(TestCase): + "Invalid or unresolveable address"): + network.dns_check('foo', '1') + ++ @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323") + def test_test_addrs(self): + # subset of real data from getaddrinfo against saltstack.com + addrinfo = [(30, 2, 17, '', ('2600:9000:21eb:a800:8:1031:abc0:93a1', 0, 0, 0)), |