summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2021-01-01 01:40:25 +0100
committerMichał Górny <mgorny@gentoo.org>2021-01-01 01:40:25 +0100
commit5ecb9047a915535adb7102488fbaf6225a91952f (patch)
tree1baf2196dde0b6f9f1b5703f2fcdea7b7874a3a3 /app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch
parentnet-analyzer/prelude-lml: Remove unused flag (diff)
downloadgentoo-5ecb9047a915535adb7102488fbaf6225a91952f.tar.gz
gentoo-5ecb9047a915535adb7102488fbaf6225a91952f.tar.bz2
gentoo-5ecb9047a915535adb7102488fbaf6225a91952f.zip
app-admin/salt: Remove old (py3.6)
Signed-off-by: Michał Górny <mgorny@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, 0 insertions, 28 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
deleted file mode 100644
index 8d28fe7f16a6..000000000000
--- a/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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)),