diff options
Diffstat (limited to 'app-admin/salt')
-rw-r--r-- | app-admin/salt/Manifest | 4 | ||||
-rw-r--r-- | app-admin/salt/files/salt-2019.2.0-newer-deps.patch | 210 | ||||
-rw-r--r-- | app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch | 20 | ||||
-rw-r--r-- | app-admin/salt/salt-2019.2.0-r1.ebuild (renamed from app-admin/salt/salt-2019.2.0.ebuild) | 8 |
4 files changed, 238 insertions, 4 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 7484ceec85ad..54e485931c51 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -13,6 +13,8 @@ AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd2 AUX salt-2017.7.8-tests.patch 3303 BLAKE2B 4bce0b82f939a997aca6da94977a261b636e410678c40a50a446813a1704608350ab6e330d3dd7dbf541b373320adcca035d3e2a70e9c626f3bd7f8216bbff6e SHA512 b5ccf399bb62325bb1cf252c9d72296138fded7dc4890695e44c2fb43c5f4f4eec852057ad427ffdfb80124be21d7b5cbe2f7497ff7d9746e09f5ed3a652aba6 AUX salt-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4 AUX salt-2018.3.4-tests.patch 2944 BLAKE2B f41c1e53297e1828c840d0ff22a49e2d47b40932615006f1fcebf6732faf0fb79a3149cc0c1be1d6daae60ce6f93e338e7eddd7cb80e076c1fdb68d560928050 SHA512 6ab26d0ae06adeb590b0b4a77fc3d0273f3624a1e8adacbaffe1ec3ae7d1066e7be5116dcde3c4118f7008a940995665777eedf15dd17c42825d08f22a33a741 +AUX salt-2019.2.0-newer-deps.patch 9260 BLAKE2B 02234367c4de7586b72502126fec7392dca96a284058b6c21733d21e5a61e12e81da054454aae20b290b9179fc7790e74ac111c7b1b638b36a935806e367902f SHA512 1e999b302323c4880103f8e68aa4c471c280484c91af0c4ac8ae85270553d178bb79a4a7d33fcc4b3a0ba2a6d95a8199d411b15e35b87f33004821dea4a07360 +AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3 AUX salt-2019.2.0-tests.patch 2793 BLAKE2B c609564673db7388a876902deb57f0aec70531ea26536954efdabdd8849eee314e840cc299f6e1fbd6a18740847a9ee8d217426adee38d36ae569f6e2e9c85ae SHA512 eb1d61f5410b36d0749cce5fc7dc08a8950061f7fb3497a122702eba7638ec3e635750b25ad5cacc4839d4828f13785ea122df43e8aff7635d79283be0392f02 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 @@ -27,5 +29,5 @@ DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56 EBUILD salt-2016.11.10.ebuild 4855 BLAKE2B 8d6321e45aca368c5919104752f3ab5f0ba0778b183a232cbbbcd19da126eaecc2d0c40c29e3745a27d7f1cff9dc620840d7cbd86de7a3d8c6454bc2ff9b900c SHA512 a4e7ae265c66a659eb70fccba97c2c52ba9fe06fe20e23d3643029fd68442aad4f82d94f8a9dd55a5f040644a50571dec645ab866b20ef05a70ad8a550553c92 EBUILD salt-2017.7.8.ebuild 4614 BLAKE2B 8974a75658aa59bfc4cd98efa9d601ebc374f407ea33d51b98b02fbcd00f195455c867f824cf16092e3859fcbccfc4a0c7ae2933a1724180d34a9f616432095b SHA512 a9a09dc1939775f46687e4e25fae24a3b7bfa48c1358bfec00fcc70fcd271d947c4f2ea5e9c0a9b4a522b87c5d2ab334f0df3d487dc2799db0531cafe23e7a2d EBUILD salt-2018.3.4.ebuild 4905 BLAKE2B 882cbf2fc6fd4547a19bbd078a27b6deb5053702fac869af73bac8a7a664f0d368e66a1a3da3b9c30bc0a892f71c1f7d5135fd14240b80cbe24c7fd9438276c7 SHA512 217870e4aef470660089e0627674b8001a3047c783a1fe6fe95c20084ad00ec089d51e0d2783c9a6a69f407aa475091bed4b8fc9a35001e32883440f30f5c1f0 -EBUILD salt-2019.2.0.ebuild 4973 BLAKE2B c70bd776e088b3b148df8a38fdd72bae9cb06716a1536efaa90d221fbcd9461f758b7f99566e1d430efe904a844d3a0ce3ef31b6673bdfae9b5f56ce1fd551c4 SHA512 1eb634805f5e0ecf8fda2bf97bba0108062625edec62d3197d25c7bf863bd4a05a13e4b79fa5ca1d4f456dc040ef130eb27afc7d1670e0175963cf011e36502c +EBUILD salt-2019.2.0-r1.ebuild 5079 BLAKE2B 09f9672a3ff9e8abb40e5233a600f91b0ffcacd8011ee0d28be53b394fc796c23cdaf11f3b75136f31a1e184a49b95e358940102f6e3c309993823dd18b8d9ba SHA512 ef245c5e1f8a1b4a5c7b187608643099929f8165028aa3fc7649a5bb347a21e7a976e9c8a0ebae39f601ab6ce8e291cbb25af4d5505b8ce3b330f3a8d0918eec MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 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 new file mode 100644 index 000000000000..bdf95e210897 --- /dev/null +++ b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch @@ -0,0 +1,210 @@ +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 new file mode 100644 index 000000000000..d0172d739554 --- /dev/null +++ b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch @@ -0,0 +1,20 @@ +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/salt-2019.2.0.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild index 16433de1b07d..eb02c39bf6f9 100644 --- a/app-admin/salt/salt-2019.2.0.ebuild +++ b/app-admin/salt/salt-2019.2.0-r1.ebuild @@ -92,9 +92,11 @@ REQUIRED_USE="|| ( raet zeromq )" RESTRICT="x86? ( test )" PATCHES=( - "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2019.2.0-tests.patch" - "${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch" + "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/salt-2019.2.0-tests.patch" + "${FILESDIR}/salt-2018.3.2-skip-zeromq-test-that-hangs.patch" + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-2019.2.0-newer-deps.patch" ) python_prepare() { |