diff options
author | 2021-01-01 01:40:25 +0100 | |
---|---|---|
committer | 2021-01-01 01:40:25 +0100 | |
commit | 5ecb9047a915535adb7102488fbaf6225a91952f (patch) | |
tree | 1baf2196dde0b6f9f1b5703f2fcdea7b7874a3a3 /app-admin/salt/files | |
parent | net-analyzer/prelude-lml: Remove unused flag (diff) | |
download | gentoo-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')
4 files changed, 0 insertions, 280 deletions
diff --git a/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch b/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch deleted file mode 100644 index fab9f38df771..000000000000 --- a/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py -index e5d2c946ae..e9140670cb 100644 ---- a/tests/unit/modules/test_event.py -+++ b/tests/unit/modules/test_event.py -@@ -47,12 +47,6 @@ class EventTestCase(TestCase, LoaderModuleMockMixin): - preload = {'id': 'id', 'tag': 'tag', 'data': 'data', - 'tok': 'salt', 'cmd': '_minion_event'} - -- with patch.dict(event.__opts__, {'transport': 'raet', -- 'local': False}): -- with patch.object(salt_transport_channel_factory, 'send', -- return_value=None): -- self.assertTrue(event.fire_master('data', 'tag')) -- - with patch.dict(event.__opts__, {'transport': 'A', - 'master_uri': 'localhost', - 'local': False}): -diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py -index 63b9ae3181..2c8294ef77 100644 ---- a/tests/unit/utils/test_verify.py -+++ b/tests/unit/utils/test_verify.py -@@ -326,7 +326,7 @@ class TestVerifyLog(TestCase): - verify_log_files([path], getpass.getuser()) - self.assertTrue(os.path.exists(path)) - -- -+@skipIf(True, "broken under sandbox") - class TestCleanPath(TestCase): - ''' - salt.utils.clean_path works as expected -@@ -396,10 +396,10 @@ class TestCleanPathLink(TestCase): - test_path = os.path.join(self.from_path, 'test') - expect_path = os.path.join(self.to_path, 'test') - ret = clean_path(self.from_path, test_path) -- assert ret == expect_path, "{} is not {}".format(ret, expect_path) -+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) - - def test_clean_path_symlinked_tgt(self): - test_path = os.path.join(self.to_path, 'test') - expect_path = os.path.join(self.to_path, 'test') - ret = clean_path(self.from_path, test_path) -- assert ret == expect_path, "{} is not {}".format(ret, expect_path) -+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) diff --git a/app-admin/salt/files/salt-2019.2.0-tests.patch b/app-admin/salt/files/salt-2019.2.0-tests.patch deleted file mode 100644 index 830fcbffe367..000000000000 --- a/app-admin/salt/files/salt-2019.2.0-tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py -index 4e93df4e62..38c13efb6b 100644 ---- a/tests/unit/fileserver/test_gitfs.py -+++ b/tests/unit/fileserver/test_gitfs.py -@@ -151,6 +151,7 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin): - if exc.errno != errno.EEXIST: - raise - -+ @skipIf(True, 'currently failing on Gentoo') - def test_per_saltenv_config(self): - opts_override = textwrap.dedent(''' - gitfs_root: salt -diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py -index 445df0c98a..17ca123172 100644 ---- a/tests/unit/grains/test_core.py -+++ b/tests/unit/grains/test_core.py -@@ -710,6 +710,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): - ) - - @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux') -+ @skipIf(True, 'Test assumes running under Xen') - def test_xen_virtual(self): - ''' - Test if OS grains are parsed correctly in Ubuntu Xenial Xerus -diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py -index 694a7aebfe..704f2d894f 100644 ---- a/tests/unit/utils/test_asynchronous.py -+++ b/tests/unit/utils/test_asynchronous.py -@@ -3,6 +3,8 @@ - # Import Python Libs - from __future__ import absolute_import, print_function, unicode_literals - -+from unittest import skipIf -+ - # Import 3rd-party libs - import tornado.testing - import tornado.gen -@@ -35,6 +37,7 @@ class HelperB(object): - - - class TestSyncWrapper(AsyncTestCase): -+ @skipIf(True, "fails in sandbox") - @tornado.testing.gen_test - def test_helpers(self): - ''' -@@ -56,6 +59,7 @@ class TestSyncWrapper(AsyncTestCase): - ret = sync.sleep() - self.assertTrue(ret) - -+ @skipIf(True, "fails in sandbox") - def test_double(self): - ''' - Test when the asynchronous wrapper object itself creates a wrap of another thing -@@ -67,6 +71,7 @@ class TestSyncWrapper(AsyncTestCase): - ret = sync.sleep() - self.assertFalse(ret) - -+ @skipIf(True, "fails in sandbox") - def test_double_sameloop(self): - ''' - Test asynchronous wrappers initiated from the same IOLoop, to ensure that -diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py -index da666ef4c7..e3523049b7 100644 ---- a/tests/unit/utils/test_jinja.py -+++ b/tests/unit/utils/test_jinja.py -@@ -1102,6 +1102,7 @@ class TestCustomExtensions(TestCase): - dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) - self.assertEqual(rendered, '16777216') - -+ @skipIf(True, 'Skipping tests that require internet access') - @flaky - def test_http_query(self): - ''' diff --git a/app-admin/salt/files/salt-2019.2.2-newer-deps.patch b/app-admin/salt/files/salt-2019.2.2-newer-deps.patch deleted file mode 100644 index ee3bc0604173..000000000000 --- a/app-admin/salt/files/salt-2019.2.2-newer-deps.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py -index 61e937536c..0f37e0d43a 100644 ---- a/salt/modules/dockercompose.py -+++ b/salt/modules/dockercompose.py -@@ -241,7 +241,7 @@ def __load_docker_compose(path): - None, None) - try: - with salt.utils.files.fopen(file_path, 'r') as fl: -- loaded = yaml.load(fl) -+ loaded = yaml.safe_load(fl) - except EnvironmentError: - return None, __standardize_result(False, - 'Could not read {0}'.format(file_path), -@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition): - None, None) - else: - try: -- loaded_definition = yaml.load(definition) -+ loaded_definition = yaml.safe_load(definition) - except yaml.YAMLError as yerr: - msg = 'Could not parse {0} {1}'.format(definition, yerr) - return None, None, __standardize_result(False, msg, -diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py -index 3042a77991..d4057a4d03 100644 ---- a/tests/integration/utils/test_win_runas.py -+++ b/tests/integration/utils/test_win_runas.py -@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase): - win32serviceutil.StartService('test service') - wait_for_service('test service') - with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: -- ret = yaml.load(fp) -+ ret = yaml.safe_load(fp) - assert ret['retcode'] == 1, ret - - @with_system_user('test-runas', on_existing='delete', delete=True, -@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase): - win32serviceutil.StartService('test service') - wait_for_service('test service') - with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: -- ret = yaml.load(fp) -+ ret = yaml.safe_load(fp) - assert ret['retcode'] == 1, ret - - @with_system_user('test-runas-admin', on_existing='delete', delete=True, -@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase): - win32serviceutil.StartService('test service') - wait_for_service('test service') - with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: -- ret = yaml.load(fp) -+ ret = yaml.safe_load(fp) - assert ret['retcode'] == 0, ret - - @with_system_user('test-runas-admin', on_existing='delete', delete=True, -@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase): - win32serviceutil.StartService('test service') - wait_for_service('test service') - with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: -- ret = yaml.load(fp) -+ ret = yaml.safe_load(fp) - assert ret['retcode'] == 0, ret - - def test_runas_service_system_user(self): -@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase): - win32serviceutil.StartService('test service') - wait_for_service('test service') - with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: -- ret = yaml.load(fp) -+ ret = yaml.safe_load(fp) - assert ret['retcode'] == 0, ret -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index a07fcbab6b..79072bb89e 100644 ---- a/tests/unit/utils/test_schema.py -+++ b/tests/unit/utils/test_schema.py -@@ -5,6 +5,7 @@ - - # Import python libs - from __future__ import absolute_import, print_function, unicode_literals -+import sys - import copy - - # Import Salt Testing Libs -@@ -506,10 +507,7 @@ class ConfigTestCase(TestCase): - {'personal_access_token': 'foo'}, - Requirements.serialize() - ) -- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): -- self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message) -- else: -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message) - - def test_boolean_config(self): - item = schema.BooleanItem(title='Hungry', description='Are you hungry?') -@@ -1733,10 +1731,11 @@ class ConfigTestCase(TestCase): - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize()) -- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): -- self.assertIn('\'4\' is not of type \'boolean\'', excinfo.exception.message) -+ -+ if sys.hexversion >= 0x03000000: -+ self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message) - else: -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message) - - class TestConf(schema.Schema): - item = schema.DictItem( -@@ -1839,10 +1838,10 @@ class ConfigTestCase(TestCase): - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': ['maybe']}, TestConf.serialize()) -- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): -- self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message) -+ if sys.hexversion >= 0x03000000: -+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message) - else: -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message) - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': 2}, TestConf.serialize()) -@@ -1894,10 +1893,10 @@ class ConfigTestCase(TestCase): - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': ['maybe']}, TestConf.serialize()) -- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): -- self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message) -+ if sys.hexversion >= 0x03000000: -+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message) - else: -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message) - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': 2}, TestConf.serialize()) 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)), |