summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2020-07-13 15:22:44 -0700
committerPatrick McLean <chutzpah@gentoo.org>2020-07-13 15:33:29 -0700
commit5dda3e3919e084562927d0179ac448e83f4b9c01 (patch)
tree7d0391330af714cb138b967a97802a73db4765cb /app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch
parentRevert "dev-python/pytest-salt: Remove redundant versions" (diff)
downloadgentoo-5dda3e3919e084562927d0179ac448e83f4b9c01.tar.gz
gentoo-5dda3e3919e084562927d0179ac448e83f4b9c01.tar.bz2
gentoo-5dda3e3919e084562927d0179ac448e83f4b9c01.zip
app-admin/salt: add 2019.2.5-r1 with USE=raet removed
Was dropped because of some python3.6 only dependencies. Disabling USE=raet makes these dependencies no longer required, the raet protocol has been depricated upstream anyway. Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.103, Repoman-2.3.23 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.patch28
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)),