diff options
Diffstat (limited to 'app-admin/salt/files')
20 files changed, 0 insertions, 758 deletions
diff --git a/app-admin/salt/files/api-confd-1 b/app-admin/salt/files/api-confd-1 deleted file mode 100644 index c70e8e7..0000000 --- a/app-admin/salt/files/api-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master - -# see man pages for salt-minion or run `salt-master --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/api-initd-4 b/app-admin/salt/files/api-initd-4 deleted file mode 100644 index a0cb826..0000000 --- a/app-admin/salt/files/api-initd-4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/salt-api" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-api.pid" -name="SALT API daemon" -retry="20" - -depend() { - use net logger -} diff --git a/app-admin/salt/files/master-confd-1 b/app-admin/salt/files/master-confd-1 deleted file mode 100644 index c70e8e7..0000000 --- a/app-admin/salt/files/master-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master - -# see man pages for salt-minion or run `salt-master --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/master-initd-4 b/app-admin/salt/files/master-initd-4 deleted file mode 100644 index e07e72b..0000000 --- a/app-admin/salt/files/master-initd-4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/salt-master" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-master.pid" -name="SALT master daemon" -retry="20" - -depend() { - use net logger -} diff --git a/app-admin/salt/files/minion-confd-1 b/app-admin/salt/files/minion-confd-1 deleted file mode 100644 index d69d83f..0000000 --- a/app-admin/salt/files/minion-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion - -# see man pages for salt-minion or run `salt-minion --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/minion-initd-4 b/app-admin/salt/files/minion-initd-4 deleted file mode 100644 index c658ccf..0000000 --- a/app-admin/salt/files/minion-initd-4 +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/salt-minion" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-minion.pid" -name="SALT minion daemon" -retry="20" - -depend() { - need net - use logger -} diff --git a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch deleted file mode 100644 index 90a48a6..0000000 --- a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/tests/support/paths.py b/tests/support/paths.py -index da93c8e1e3..895c636fef 100644 ---- a/tests/support/paths.py -+++ b/tests/support/paths.py -@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path: - if TESTS_DIR not in sys.path: - sys.path.insert(1, TESTS_DIR) - --SYS_TMP_DIR = os.path.abspath(os.path.realpath( -+SYS_TMP_DIR = os.path.abspath( - # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long - # for unix sockets: ``error: AF_UNIX path too long`` - # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} - os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp' --)) -+) - TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir') - FILES = os.path.join(INTEGRATION_TEST_DIR, 'files') - PYEXEC = 'python{0}.{1}'.format(*sys.version_info) diff --git a/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch b/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch deleted file mode 100644 index 7b94faf..0000000 --- a/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py -index ccb337462e..97d2962e5e 100644 ---- a/tests/unit/transport/test_zeromq.py -+++ b/tests/unit/transport/test_zeromq.py -@@ -45,6 +45,10 @@ ON_SUSE = False - if 'SuSE' in linux_distribution(full_distribution_name=False): - ON_SUSE = True - -+ON_GENTOO = False -+if 'Gentoo' in linux_distribution(full_distribution_name=False): -+ ON_GENTOO = True -+ - - class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin): - ''' -@@ -122,63 +126,6 @@ class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin): - return payload, {'fun': 'send_clear'} - - --class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin): -- ''' -- Test all of the clear msg stuff -- ''' -- def setUp(self): -- self.channel = salt.transport.client.ReqChannel.factory(self.minion_config, crypt='clear') -- -- def tearDown(self): -- del self.channel -- -- @classmethod -- @tornado.gen.coroutine -- def _handle_payload(cls, payload): -- ''' -- TODO: something besides echo -- ''' -- raise tornado.gen.Return((payload, {'fun': 'send_clear'})) -- -- --@flaky --@skipIf(ON_SUSE, 'Skipping until https://github.com/saltstack/salt/issues/32902 gets fixed') --class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin): -- def setUp(self): -- self.channel = salt.transport.client.ReqChannel.factory(self.minion_config) -- -- def tearDown(self): -- del self.channel -- -- @classmethod -- @tornado.gen.coroutine -- def _handle_payload(cls, payload): -- ''' -- TODO: something besides echo -- ''' -- raise tornado.gen.Return((payload, {'fun': 'send'})) -- -- # TODO: make failed returns have a specific framing so we can raise the same exception -- # on encrypted channels -- # -- #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- # -- # WARNING: This test will fail randomly on any system with > 1 CPU core!!! -- # -- #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- def test_badload(self): -- ''' -- Test a variety of bad requests, make sure that we get some sort of error -- ''' -- # TODO: This test should be re-enabled when Jenkins moves to C7. -- # Once the version of salt-testing is increased to something newer than the September -- # release of salt-testing, the @flaky decorator should be applied to this test. -- msgs = ['', [], tuple()] -- for msg in msgs: -- with self.assertRaises(salt.exceptions.AuthenticationError): -- ret = self.channel.send(msg, timeout=5) -- -- - class BaseZMQPubCase(AsyncTestCase, AdaptedConfigurationTestCaseMixin): - ''' - Test the req server/client pair diff --git a/app-admin/salt/files/salt-2018.3.4-tests.patch b/app-admin/salt/files/salt-2018.3.4-tests.patch deleted file mode 100644 index ac3dbb8..0000000 --- a/app-admin/salt/files/salt-2018.3.4-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py -index 3874b0001c..40304075eb 100644 ---- a/tests/unit/grains/test_core.py -+++ b/tests/unit/grains/test_core.py -@@ -685,22 +685,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): - 'Docker' - ) - -- @skipIf(salt.utils.platform.is_windows(), 'System is Windows') -- def test_xen_virtual(self): -- ''' -- Test if OS grains are parsed correctly in Ubuntu Xenial Xerus -- ''' -- with patch.object(os.path, 'isfile', MagicMock(return_value=False)): -- with patch.dict(core.__salt__, {'cmd.run': MagicMock(return_value='')}), \ -- patch.object(os.path, -- 'isfile', -- MagicMock(side_effect=lambda x: True if x == '/sys/bus/xen/drivers/xenconsole' else False)): -- log.debug('Testing Xen') -- self.assertEqual( -- core._virtual({'kernel': 'Linux'}).get('virtual_subtype'), -- 'Xen PV DomU' -- ) -- - def _check_ipaddress(self, value, ip_v): - ''' - check if ip address in a list is valid -diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py -index 694a7aebfe..9e22c278e9 100644 ---- a/tests/unit/utils/test_asynchronous.py -+++ b/tests/unit/utils/test_asynchronous.py -@@ -35,19 +35,6 @@ class HelperB(object): - - - class TestSyncWrapper(AsyncTestCase): -- @tornado.testing.gen_test -- def test_helpers(self): -- ''' -- Test that the helper classes do what we expect within a regular asynchronous env -- ''' -- ha = HelperA() -- ret = yield ha.sleep() -- self.assertTrue(ret) -- -- hb = HelperB() -- ret = yield hb.sleep() -- self.assertFalse(ret) -- - def test_basic_wrap(self): - ''' - Test that we can wrap an asynchronous caller. -@@ -55,24 +42,3 @@ class TestSyncWrapper(AsyncTestCase): - sync = asynchronous.SyncWrapper(HelperA) - ret = sync.sleep() - self.assertTrue(ret) -- -- def test_double(self): -- ''' -- Test when the asynchronous wrapper object itself creates a wrap of another thing -- -- This works fine since the second wrap is based on the first's IOLoop so we -- don't have to worry about complex start/stop mechanics -- ''' -- sync = asynchronous.SyncWrapper(HelperB) -- ret = sync.sleep() -- self.assertFalse(ret) -- -- def test_double_sameloop(self): -- ''' -- Test asynchronous wrappers initiated from the same IOLoop, to ensure that -- we don't wire up both to the same IOLoop (since it causes MANY problems). -- ''' -- a = asynchronous.SyncWrapper(HelperA) -- sync = asynchronous.SyncWrapper(HelperB, (a,)) -- ret = sync.sleep() -- self.assertFalse(ret) diff --git a/app-admin/salt/files/salt-2019.2.0-newer-deps.patch b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch deleted file mode 100644 index bdf95e2..0000000 --- a/app-admin/salt/files/salt-2019.2.0-newer-deps.patch +++ /dev/null @@ -1,210 +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/salt/serializers/yaml.py b/salt/serializers/yaml.py -index c95b40e48f..2154e5dcab 100644 ---- a/salt/serializers/yaml.py -+++ b/salt/serializers/yaml.py -@@ -72,6 +72,7 @@ def serialize(obj, **options): - ''' - - options.setdefault('Dumper', Dumper) -+ options.setdefault('default_flow_style', None) - try: - response = yaml.dump(obj, **options) - if response.endswith('\n...\n'): -diff --git a/salt/serializers/yamlex.py b/salt/serializers/yamlex.py -index 2e4ba6fb2b..e42634f580 100644 ---- a/salt/serializers/yamlex.py -+++ b/salt/serializers/yamlex.py -@@ -182,6 +182,7 @@ def serialize(obj, **options): - ''' - - options.setdefault('Dumper', Dumper) -+ options.setdefault('default_flow_style', None) - try: - response = yaml.dump(obj, **options) - if response.endswith('\n...\n'): -diff --git a/salt/utils/yamldumper.py b/salt/utils/yamldumper.py -index 9892c87d23..3692ea324a 100644 ---- a/salt/utils/yamldumper.py -+++ b/salt/utils/yamldumper.py -@@ -115,6 +115,7 @@ def dump(data, stream=None, **kwargs): - ''' - if 'allow_unicode' not in kwargs: - kwargs['allow_unicode'] = True -+ kwargs.setdefault('default_flow_style', None) - return yaml.dump(data, stream, **kwargs) - - -@@ -126,4 +127,5 @@ def safe_dump(data, stream=None, **kwargs): - ''' - if 'allow_unicode' not in kwargs: - kwargs['allow_unicode'] = True -+ kwargs.setdefault('default_flow_style', None) - return yaml.dump(data, stream, Dumper=SafeOrderedDumper, **kwargs) -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/serializers/test_serializers.py b/tests/unit/serializers/test_serializers.py -index 3bf42b67d7..ea42d617d7 100644 ---- a/tests/unit/serializers/test_serializers.py -+++ b/tests/unit/serializers/test_serializers.py -@@ -68,9 +68,24 @@ class TestSerializers(TestCase): - serialized = yamlex.serialize(data) - assert serialized == '{foo: bar}', serialized - -+ serialized = yamlex.serialize(data, default_flow_style=False) -+ assert serialized == 'foo: bar', serialized -+ - deserialized = yamlex.deserialize(serialized) - assert deserialized == data, deserialized - -+ serialized = yaml.serialize(data) -+ assert serialized == '{foo: bar}', serialized -+ -+ deserialized = yaml.deserialize(serialized) -+ assert deserialized == data, deserialized -+ -+ serialized = yaml.serialize(data, default_flow_style=False) -+ assert serialized == 'foo: bar', serialized -+ -+ deserialized = yaml.deserialize(serialized) -+ assert deserialized == data, deserialized -+ - @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls') - def test_serialize_complex_sls(self): - data = OrderedDict([ -@@ -84,6 +99,12 @@ class TestSerializers(TestCase): - deserialized = yamlex.deserialize(serialized) - assert deserialized == data, deserialized - -+ serialized = yaml.serialize(data) -+ assert serialized == '{bar: 2, baz: true, foo: 1}', serialized -+ -+ deserialized = yaml.deserialize(serialized) -+ assert deserialized == data, deserialized -+ - @skipIf(not yaml.available, SKIP_MESSAGE % 'yaml') - @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls') - def test_compare_sls_vs_yaml(self): -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index 677cd0778b..5c2f1fd8fd 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,7 +507,7 @@ class ConfigTestCase(TestCase): - {'personal_access_token': 'foo'}, - Requirements.serialize() - ) -- 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?') -@@ -1730,7 +1731,10 @@ class ConfigTestCase(TestCase): - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize()) -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ if sys.hexversion >= 0x03000000: -+ self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message) -+ else: -+ self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message) - - class TestConf(schema.Schema): - item = schema.DictItem( -@@ -1833,7 +1837,10 @@ class ConfigTestCase(TestCase): - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': ['maybe']}, TestConf.serialize()) -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ if sys.hexversion >= 0x03000000: -+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message) -+ else: -+ 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()) -@@ -1885,7 +1892,10 @@ class ConfigTestCase(TestCase): - - with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: - jsonschema.validate({'item': ['maybe']}, TestConf.serialize()) -- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) -+ if sys.hexversion >= 0x03000000: -+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message) -+ else: -+ 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.0-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch deleted file mode 100644 index d0172d7..0000000 --- a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py -index be26b3f093..ca971556d5 100644 ---- a/tests/unit/modules/test_boto_apigateway.py -+++ b/tests/unit/modules/test_boto_apigateway.py -@@ -169,6 +169,7 @@ def _has_required_botocore(): - return True - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - conn = None - -@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - self.addCleanup(delattr, self, 'conn') - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseMixin(object): - def _diff_list_dicts(self, listdict1, listdict2, sortkey): - ''' 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 830fcbf..0000000 --- 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 ee3bc06..0000000 --- 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 8d28fe7..0000000 --- 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)), diff --git a/app-admin/salt/files/salt-api.service b/app-admin/salt/files/salt-api.service deleted file mode 100644 index fd9f665..0000000 --- a/app-admin/salt/files/salt-api.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=The Salt Master Server -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/bin/salt-api - -[Install] -WantedBy=multi-user.target diff --git a/app-admin/salt/files/salt-master.service b/app-admin/salt/files/salt-master.service deleted file mode 100644 index 4f3827e..0000000 --- a/app-admin/salt/files/salt-master.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=The Salt Master Server -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/bin/salt-master - -[Install] -WantedBy=multi-user.target diff --git a/app-admin/salt/files/salt-minion.service b/app-admin/salt/files/salt-minion.service deleted file mode 100644 index 2f199f9..0000000 --- a/app-admin/salt/files/salt-minion.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=The Salt Minion -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/bin/salt-minion - -[Install] -WantedBy=multi-user.target diff --git a/app-admin/salt/files/salt-syndic.service b/app-admin/salt/files/salt-syndic.service deleted file mode 100644 index 922eef3..0000000 --- a/app-admin/salt/files/salt-syndic.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=The Salt Master Server -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/bin/salt-syndic - -[Install] -WantedBy=multi-user.target diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1 deleted file mode 100644 index d69d83f..0000000 --- a/app-admin/salt/files/syndic-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion - -# see man pages for salt-minion or run `salt-minion --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/syndic-initd-4 b/app-admin/salt/files/syndic-initd-4 deleted file mode 100644 index 8908f2c..0000000 --- a/app-admin/salt/files/syndic-initd-4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/salt-syndic" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-syndic.pid" -name="SALT syndic daemon" -retry="20" - -depend() { - use net logger -} |