diff options
Diffstat (limited to 'app-admin/salt')
17 files changed, 30 insertions, 783 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 94c0d9c5b972..221a89363be0 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -4,24 +4,11 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f -AUX salt-2014.7.1-remove-pydsl-includes-test.patch 3605 BLAKE2B 1e43a692afebee14ec62873ad718126be09447eeeb949074d5aa6c6186cad4aa4cea2a3df814ce150414b8ec200b996fad6c21eca66d1a1dbe0e3de9e7660e39 SHA512 fe56cb6b5f91586e9acba136601c9380f158a4dc3a0316a00b23703a5e5de7b8ae3cec7b3bd606e0b7a927f8a7fc28c57e5dd5f10755f34e9dbd6052c9dc9b50 -AUX salt-2015.5.10-buggy-tests.patch 2034 BLAKE2B c3437ec0686a026c2d50ae758ae550b5d61005a638745c64a0fc81995606d9938c585f092012e164c5387141a8aef7aae7da46d5dd8a467042328f671eaccf50 SHA512 f848262c8ce2338cc847b5c8038eb40f6ec15f4ce07d58e9a70503fcbe2b8651edb411621697a1c5aaf663e4dd821b396ca16088846e3ec6f2a64c78ecf9ac64 -AUX salt-2015.5.5-auth-tests.patch 1572 BLAKE2B 59584a38091cbff17bcbf5fd1cb54d6ba2c4e720a9b5c2d45d00bf2f8bd60ec2b326970cf99944d62bb2d0a6357a2d8ed8ef26097355ad3bae56be02aaa213b5 SHA512 6cab8a7c2a405420f6b2df7cd21773852ef1582f8a2f54bcbd120fa4966ac390447e907555b4b82764d8ae406cee095b5dd1dd0070d5a67a4ab10329bed39c3a -AUX salt-2015.5.5-cron-tests.patch 961 BLAKE2B 018aa48d769e2d6a822310f4941952260b6e4882b8f87964431bcb3eb02fb649ff3a9086c7db7b861bc609ce62d64eceae7aed2a40a7e2ea78f0bf8791e8b87c SHA512 d6ddb67d91ac0ec8c9256dba6e7d9efd15c892b6a8396b571b6aa849393d19e3a74e48906e1e03ddc9301b8fe7e1811eb1c88048daedcd8737e5edf0c4e62d74 -AUX salt-2015.5.5-remove-buggy-tests.patch 2114 BLAKE2B 10e699b5d0cb78e2421f69ac232f42c79369218d89aaed9c13ab56c7cb677e66f0963d26936c5573bec0e5e472c3b61d94794222e28fe7c2382167857f1ed029 SHA512 8669e2ffa926578e238cc8f18fbbc6e691cf9a4029e4a90c92214bfbd99c878efe749041912c7ad6ba90afee2baa8a4047318105b579babbf349186c8b9302a9 -AUX salt-2015.5.7-tmpdir.patch 1489 BLAKE2B c52240ef70302e31e6f4d3e84230e99c660f9a5979dde3efe5d17e9251d2f84113e309f16077865078bec4909d6d5753e11630bb99372b2045378caccff99664 SHA512 37d2af5375384dfe1e0b5d45eb6a51576767420e0bacd13f7ea5da801c359743ac420c0d6b258aa237d4dab82290a832b3ea6c96aa7547ecc8eb8f0c0f047b4a -AUX salt-2015.8.0-remove-buggy-tests.patch 2552 BLAKE2B 10c4d615e76f64c0f3504e3999509cc4947cdbef4c4d33180f9dc27c12f17353ca614fbca8dcf9ad06ba07bf7be163a706a8503c8717f800bcf88117d9a025e0 SHA512 31b8509feb6262e3211263571d9a006879a136c8c0ea5202ebf314ea6aeb3279b0ac63bb3800244ddb6ba9eb9159ee3ad8e389fa3e68f4d414d89cddb792a056 -AUX salt-2015.8.10-remove-failing-boto-test.patch 2058 BLAKE2B 33b72ed7f5eee1f7e5a9ae82da022244887e736979122b13f777dafd94e0130fb663d28804985bbd8c8d55aadb005e72099cdf283c00a12fc27cc23eb2cc269a SHA512 98aed5c1ba1fc2647ed4771a57b7d2fe0f66e4da7936bf013c305f014e5c9f7158e9d966b961b9d6ba4fba57a1c8101d3c053598f0ebcac023016e9dbb1e765f -AUX salt-2015.8.13-failing-gateway-tests.patch 3539 BLAKE2B 0f25e5edb41cd932fe8c0a06c4022b8b9b612a7022578002f64885cb71689e914e455e4404d1840a1ce1b9432a450361399f1da0934e55a0b455722092250cac SHA512 577825438e0193edc7df0234fba66dc61e56c74ae6e50b998072374a93052151d987def04d3a618c5a68b9ef2c8e84559adfcc25428b701418521d5f01a57466 -AUX salt-2015.8.13-sanitize-minion-name.patch 1003 BLAKE2B 0446565484fbf00dc3fe9acd72b90353447b6e892172111c794a3475a03132183d2bd8ec6c6b60cb84863dd366e3e1fae84d7ad41dca3c9530d78ee4a37ffd3c SHA512 04f50936896b83804cc25ca329cb32a7f388be9ec5fd6f9d0cf452e3af3f6c8c3f025c119ed29a2399e11669b9eec373d77fce17d1ea64107f9268f9741cb73c -AUX salt-2015.8.2-tmpdir.patch 2502 BLAKE2B 97cd158e92cde16d653f590a3902471e46b2c6f9c522fbccf42c09288388a56539eb518309db448f3698e5cab042affb80b34cc528bbbc65ea51be6d34ab2ffc SHA512 ed8eed9e2fa36718d7320e1ae650a990ae2d95d7c6a544ffd96f358750158231c334ab1eee6fe3e5e6a25d3b62c1fc0a149508eb3bd23f7ad152a82ec7efa1ac AUX salt-2016.11.0-broken-tests.patch 1092 BLAKE2B 5ab3cccc024b5cdc4e6eecd5f164c9f931aa25b23264151ef15645e63e1586f2a093f29a9835685482d831b98e131a385799d39b9158c865af83724a994bbdb1 SHA512 d23c16a5ed8c0fbd4287d73e45b700d465224c5f3b32c47bb2994703a4b4c261053b9c79444973cfaf86afa2850b8499a6b7923317fde3de43840a575ada74b4 AUX salt-2016.11.0-remove-file-tree-test.patch 1480 BLAKE2B ad2285dd37d5a727feac291c5598b4dc56c98674566c3816fb17577ce44da4d20ddb60c1f0b8a8c8f7d2fe6f33918d00e5010c47c4441728f6a1a9ca94cf4015 SHA512 0503b4ecd16c2f67b53f1ce52b5f77cacf8de420024c5c7751d3caa06de2d1e685eef8d4021dfe86a5850ac23f58705a375e87922b3c5fbeb8c11290690624bc AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2ad563be100f80bfb97a14821af43134dce76d46d9c9431f8b2866eec0272e6de62e281c9a469f8177f214e7c5f6a7e SHA512 ef654d871178618dab68ad9b4062560cfa57fa421834b142639a11d12679ebc97afc27fa572dd77b74d86ba722bb8575b64045bbf3cab9f2d0e2cefeca38c4bd AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79 -AUX salt-2016.3.4-dont-test-ordering.patch 1485 BLAKE2B 4075d7c43d7f6b419357aed1f6a3efd82a4bdace1416f3702e3d51bcd5e4d359d20fd6e2f584a6faee30c4f14d993ae58f4b4f0241bfa8eff0c081c7c6b395c3 SHA512 4cc5a4d4380e6ae795aed7650667f1ea89315b429c495128f3e6eb311977bfb713d3d4536785ff1f087188ed14e81792daf73225cdce0fcb4ff0ffa170f1cbe3 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd -AUX salt-2016.3.5-tmpdir.patch 1982 BLAKE2B b8d587e6139ac49b78892572070d0985fb78de3986fedfc8df04276da69a6f7f0c28fcb1f41df282747c80bfaba266fdcfeb58890e494f32873d870add388d98 SHA512 755ac34298c6cbc57cf7404b209bd45ad216c07bb55b303e97375e1912aead765dddddbe3331314e4f245c6848e62447a5bb16b04367f20bb8387e89d0254859 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17 AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75 AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f @@ -31,12 +18,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef -DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d -DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b -DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73 -EBUILD salt-2016.11.8-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f +DIST salt-2017.7.5.tar.gz 11043026 BLAKE2B 9cae4e6ca3b0bac0dc0b9b9a5ae01e0bfb8e8b899aa029b324ac10c8c84024bbc419ace068cd0d2bff84ec6ddf1d13faf68ce34c68c19892c700c38e81da8c7c SHA512 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d +DIST salt-2018.3.0.tar.gz 13448567 BLAKE2B 9048f9e507ded238bfd54d0aabfefb56522b20ba2479c3bf5aefc47fff0b6ce516709ad6e9109441941a60596d4f06a43c1448a149225f3f87715327a190d313 SHA512 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5 EBUILD salt-2016.11.9-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f -EBUILD salt-2017.7.2-r2.ebuild 4472 BLAKE2B 53e91df5216b70e39b0fb37d607f912f781cc784e95ad70c4ffd52dbb6d335121ea84ed77dc0067f7777362a623773332959731420db6bd45e31ff5ee7d0e852 SHA512 a77a72b91b62c7ec615c79a1634cd869d881b9fffe34d3fd5965a1a21e59a87b76298623c89f65b1e4afb590f7f75de4b20cdc47ae29fcb022d427e9ca03dd82 -EBUILD salt-2017.7.4-r2.ebuild 4617 BLAKE2B 6998d5cf0e486f5941f25ac22f949239f15ee896d74845e3ff8701b49d07fcd1ce5e4c2b87acc2e856ac4ea242c206c00196c05f9a0fefb12af0c49ff182e6ea SHA512 113d6ca37a3829b024588827876ae2b7c03ebe47b9bf6ce484a7a7e454844ba8895dd53ea09d7910c2afc967eaebe5ad44ae1a9381c7c5e391f59318640fea0b +EBUILD salt-2017.7.5.ebuild 4727 BLAKE2B 2b1a53cca64ed98ae9999f84bbb7da5dafad5e9b74b4248bf3728a07db3bff77c5ac959ebadb907ae31a15569390c2f01bfe288ea296e7f27df169258643836c SHA512 013670dec20115ca9e23e8f545abd3dbd66af5ab1b09a4c6118f3106caa2747b3000ffa47928427a5b8690e1e9bb647e44f8000275dcc07cee949915b3821ea4 +EBUILD salt-2018.3.0.ebuild 4892 BLAKE2B dffbb8de5ed43477c02b177e80528ed2c51f66e59f033da4d7e57bc2af13dab6a854cc3025d4cdcd63446ed7f873e3db1f2216bfe82802428d6d5f0fc598088c SHA512 8862e90908e207ef72fa7783739a279cf8315de4c2c76fb3624043cfd0e8f8adb23885d40a7e66b2dce26a1c7f1b9f55b86e5a8c0a5dd51ca53575d0dc13d497 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 diff --git a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch deleted file mode 100644 index 7c33c12f5c71..000000000000 --- a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py -index 57ba81e..b26154e 100644 ---- a/tests/unit/pydsl_test.py -+++ b/tests/unit/pydsl_test.py -@@ -298,99 +298,6 @@ class PyDSLRendererTestCase(TestCase): - finally: - shutil.rmtree(dirpath, ignore_errors=True) - -- def test_rendering_includes(self): -- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) -- if not os.path.isdir(dirpath): -- self.skipTest( -- 'The temporary directory {0!r} was not created'.format( -- dirpath -- ) -- ) -- output = os.path.join(dirpath, 'output') -- try: -- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- yyy = include('yyy') -- -- # ensure states in xxx are run first, then those in yyy and then those in aaa last. -- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal')) -- extend(state('.start').stateconf.require(stateconf='yyy::goal')) -- -- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}')) -- -- __pydsl__.set(ordered=True) -- -- yyy.hello('red', 1) -- yyy.hello('green', 2) -- yyy.hello('blue', 3) -- '''.format(output))) -- -- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\ -- #!stateconf -os yaml . jinja -- -- include: -- - yyy -- -- extend: -- yyy::start: -- stateconf.set: -- - require: -- - stateconf: .goal -- -- yyy::Y1: -- cmd.run: -- - name: 'echo Y1 extended >> {0}' -- -- .X1: -- cmd.run: -- - name: echo X1 >> {1} -- - cwd: / -- .X2: -- cmd.run: -- - name: echo X2 >> {2} -- - cwd: / -- .X3: -- cmd.run: -- - name: echo X3 >> {3} -- - cwd: / -- -- '''.format(output, output, output, output))) -- -- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- __pydsl__.set(ordered=True) -- -- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/') -- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/') -- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/') -- -- def hello(color, number): -- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/') -- '''.format(output, output, output, output))) -- -- state_highstate({'base': ['aaa']}, dirpath) -- expected = textwrap.dedent('''\ -- X1 -- X2 -- X3 -- Y1 extended -- Y2 extended -- Y3 -- hello red 1 -- hello green 2 -- hello blue 3 -- ''') -- -- with salt.utils.fopen(output, 'r') as f: -- self.assertEqual(sorted(f.read()), sorted(expected)) -- -- finally: -- shutil.rmtree(dirpath, ignore_errors=True) -- - def test_compile_time_state_execution(self): - if not sys.stdin.isatty(): - self.skipTest('Not attached to a TTY') diff --git a/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch b/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch deleted file mode 100644 index e9330bd255b5..000000000000 --- a/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py -index 82dfe28..ced9ee5 100644 ---- a/tests/unit/modules/boto_vpc_test.py -+++ b/tests/unit/modules/boto_vpc_test.py -@@ -441,9 +441,9 @@ class BotoVpcTestCase(BotoVpcTestCaseBase): - describe_vpc = boto_vpc.describe(vpc_id=vpc.id, **conn_parameters) - - vpc_properties = dict(cidr_block=unicode(cidr_block), -- is_default=None, -+ is_default=False, - state=u'available', -- tags={'Name': 'test', 'test': 'testvalue'}, -+ tags={u'Name': u'test', u'test': u'testvalue'}, - dhcp_options_id=u'dopt-7a8b9c2d', - instance_tenancy=u'default') - -diff --git a/tests/unit/states/pip_test.py b/tests/unit/states/pip_test.py -index 6e7d083..9a83951 100644 ---- a/tests/unit/states/pip_test.py -+++ b/tests/unit/states/pip_test.py -@@ -37,17 +37,6 @@ class PipStateTest(TestCase, integration.SaltReturnAssertsMixIn): - def test_install_requirements_parsing(self): - mock = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - pip_list = MagicMock(return_value={'pep8': '1.3.3'}) -- with patch.dict(pip_state.__salt__, {'cmd.run_all': mock, -- 'pip.list': pip_list}): -- with patch.dict(pip_state.__opts__, {'test': True}): -- ret = pip_state.installed('pep8=1.3.2') -- self.assertSaltFalseReturn({'test': ret}) -- self.assertInSaltComment( -- 'Invalid version specification in package pep8=1.3.2. ' -- '\'=\' is not supported, use \'==\' instead.', -- {'test': ret} -- ) -- - mock = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - pip_list = MagicMock(return_value={'pep8': '1.3.3'}) - pip_install = MagicMock(return_value={'retcode': 0}) diff --git a/app-admin/salt/files/salt-2015.5.5-auth-tests.patch b/app-admin/salt/files/salt-2015.5.5-auth-tests.patch deleted file mode 100644 index fa092d1f3eaf..000000000000 --- a/app-admin/salt/files/salt-2015.5.5-auth-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/tests/unit/auth_test.py b/tests/unit/auth_test.py -index 10b77e9..c40f439 100644 ---- a/tests/unit/auth_test.py -+++ b/tests/unit/auth_test.py -@@ -38,12 +38,12 @@ class LoadAuthTestCase(TestCase): - - # Test a case with valid params - with patch('salt.utils.format_call') as format_call_mock: -- expected_ret = call('fake_func_str', { -+ expected_ret = [call('fake_func_str', { - 'username': 'test_user', - 'test_password': '', - 'show_timeout': False, - 'eauth': 'pam' -- }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS) -+ }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)] - ret = self.lauth.load_name(valid_eauth_load) - format_call_mock.assert_has_calls(expected_ret) - -@@ -53,12 +53,12 @@ class LoadAuthTestCase(TestCase): - 'test_password': '', - 'eauth': 'pam'} - with patch('salt.utils.format_call') as format_call_mock: -- expected_ret = call('fake_groups_function_str', { -+ expected_ret = [call('fake_groups_function_str', { - 'username': 'test_user', - 'test_password': '', - 'show_timeout': False, - 'eauth': 'pam' -- }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS) -+ }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)] - self.lauth.get_groups(valid_eauth_load) - format_call_mock.assert_has_calls(expected_ret) - diff --git a/app-admin/salt/files/salt-2015.5.5-cron-tests.patch b/app-admin/salt/files/salt-2015.5.5-cron-tests.patch deleted file mode 100644 index d0c4ffc92df1..000000000000 --- a/app-admin/salt/files/salt-2015.5.5-cron-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/tests/unit/modules/cron_test.py b/tests/unit/modules/cron_test.py -index 017eabd..dac0122 100644 ---- a/tests/unit/modules/cron_test.py -+++ b/tests/unit/modules/cron_test.py -@@ -573,10 +573,10 @@ class PsTestCase(TestCase): - @patch('salt.modules.cron._write_cron_lines') - @patch('salt.modules.cron.list_tab', new=MagicMock(return_value=STUB_SIMPLE_CRON_DICT)) - def test_set_special(self, write_cron_lines_mock): -- expected_write_call = call('DUMMY_USER', -+ expected_write_call = [call('DUMMY_USER', - ['5 0 * * * /tmp/no_script.sh\n', - '# Lines below here are managed by Salt, do not edit\n', -- '@hourly echo Hi!\n']) -+ '@hourly echo Hi!\n'])] - ret = cron.set_special('DUMMY_USER', '@hourly', 'echo Hi!') - write_cron_lines_mock.assert_has_calls(expected_write_call) - diff --git a/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch deleted file mode 100644 index b36e35fb9a58..000000000000 --- a/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/tests/unit/modules/darwin_sysctl_test.py b/tests/unit/modules/darwin_sysctl_test.py -index 51e8f23..36d005f 100644 ---- a/tests/unit/modules/darwin_sysctl_test.py -+++ b/tests/unit/modules/darwin_sysctl_test.py -@@ -64,18 +64,6 @@ class DarwinSysctlTestCase(TestCase): - 'net.inet.icmp.icmplim', 50), ret) - - @patch('os.path.isfile', MagicMock(return_value=False)) -- def test_persist_no_conf_failure(self): -- ''' -- Tests adding of config file failure -- ''' -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- darwin_sysctl.persist, -- 'net.inet.icmp.icmplim', -- 50, config=None) -- -- @patch('os.path.isfile', MagicMock(return_value=False)) - def test_persist_no_conf_success(self): - ''' - Tests successful add of config file when previously not one -diff --git a/tests/unit/modules/linux_sysctl_test.py b/tests/unit/modules/linux_sysctl_test.py -index 08fc80f..c6e40b8 100644 ---- a/tests/unit/modules/linux_sysctl_test.py -+++ b/tests/unit/modules/linux_sysctl_test.py -@@ -82,18 +82,6 @@ class LinuxSysctlTestCase(TestCase): - 'net.ipv4.ip_forward', 1), ret) - - @patch('os.path.isfile', MagicMock(return_value=False)) -- def test_persist_no_conf_failure(self): -- ''' -- Tests adding of config file failure -- ''' -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- linux_sysctl.persist, -- 'net.ipv4.ip_forward', -- 1, config=None) -- -- @patch('os.path.isfile', MagicMock(return_value=False)) - def test_persist_no_conf_success(self): - ''' - Tests successful add of config file when previously not one diff --git a/app-admin/salt/files/salt-2015.5.7-tmpdir.patch b/app-admin/salt/files/salt-2015.5.7-tmpdir.patch deleted file mode 100644 index 8a19c32e0f71..000000000000 --- a/app-admin/salt/files/salt-2015.5.7-tmpdir.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/tests/unit/modules/grains_test.py b/tests/unit/modules/grains_test.py -index 3473c03..ea37d66 100644 ---- a/tests/unit/modules/grains_test.py -+++ b/tests/unit/modules/grains_test.py -@@ -1,6 +1,8 @@ - # -*- coding: utf-8 -*- - - import copy -+import os.path -+import tempfile - - # Import Salt Testing libs - from salttesting import TestCase, skipIf -@@ -20,8 +22,8 @@ from salt.modules import grains as grainsmod - from salt.utils import dictupdate - - grainsmod.__opts__ = { -- 'conf_file': '/tmp/__salt_test_grains', -- 'cachedir': '/tmp/__salt_test_grains_cache_dir' -+ 'conf_file': os.path.join(tempfile.gettempdir(), '__salt_test_grains'), -+ 'cachedir': os.path.join(tempfile.gettempdir(), '__salt_test_grains_cache_dir') - } - - grainsmod.__salt__ = {} -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index 3cfb2f0..b3f3bee 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -69,7 +69,7 @@ class ArchiveTest(TestCase): - 'cmd.run_all': mock_run}): - filename = os.path.join( - tmp_dir, -- 'files/test/_tmp_test_archive_.tar' -+ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar' - ) - for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): - ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch deleted file mode 100644 index 92ab0624e595..000000000000 --- a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/tests/unit/modules/mount_test.py b/tests/unit/modules/mount_test.py -index 282539d..c88a7a8 100644 ---- a/tests/unit/modules/mount_test.py -+++ b/tests/unit/modules/mount_test.py -@@ -103,12 +103,6 @@ class MountTestCase(TestCase): - self.assertTrue(mount.rm_fstab('name', 'device')) - - mock = MagicMock(return_value={'name': 'name'}) -- with patch.object(mount, 'fstab', mock): -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- mount.rm_fstab, -- config=None) - - def test_set_fstab(self): - ''' -@@ -143,12 +137,6 @@ class MountTestCase(TestCase): - self.assertTrue(mount.rm_automaster('name', 'device')) - - mock = MagicMock(return_value={'name': 'name'}) -- with patch.object(mount, 'fstab', mock): -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- mount.rm_automaster, -- 'name', 'device') - - def test_set_automaster(self): - ''' -diff --git a/tests/unit/modules/puppet_test.py b/tests/unit/modules/puppet_test.py -index 6a43fd4..3be039c 100644 ---- a/tests/unit/modules/puppet_test.py -+++ b/tests/unit/modules/puppet_test.py -@@ -91,10 +91,6 @@ class PuppetTestCase(TestCase): - with patch('salt.utils.fopen', mock_open()): - self.assertTrue(puppet.disable()) - -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- puppet.disable) - - def test_status(self): - ''' -@@ -154,10 +150,6 @@ class PuppetTestCase(TestCase): - mock_open(read_data="resources: 1")): - self.assertDictEqual(puppet.summary(), {'resources': 1}) - -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- puppet.summary) - - def test_plugin_sync(self): - ''' diff --git a/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch b/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch deleted file mode 100644 index 5a4d273d7848..000000000000 --- a/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/tests/unit/modules/boto_secgroup_test.py b/tests/unit/modules/boto_secgroup_test.py -index f1c6bb1..07fd8ec 100644 ---- a/tests/unit/modules/boto_secgroup_test.py -+++ b/tests/unit/modules/boto_secgroup_test.py -@@ -192,30 +192,6 @@ class BotoSecgroupTestCase(TestCase): - **conn_parameters) - self.assertEqual(group_vpc.id, retrieved_group_id) - -- @mock_ec2 -- def test_get_config_single_rule_group_name(self): -- ''' -- tests return of 'config' when given group name. get_config returns an OrderedDict. -- ''' -- group_name = _random_group_name() -- ip_protocol = u'tcp' -- from_port = 22 -- to_port = 22 -- cidr_ip = u'0.0.0.0/0' -- rules_egress = [{'to_port': -1, 'from_port': -1, 'ip_protocol': u'-1', 'cidr_ip': u'0.0.0.0/0'}] -- -- conn = boto.ec2.connect_to_region(region, **boto_conn_parameters) -- group = conn.create_security_group(name=group_name, description=group_name) -- group.authorize(ip_protocol=ip_protocol, from_port=from_port, to_port=to_port, cidr_ip=cidr_ip) -- # setup the expected get_config result -- expected_get_config_result = OrderedDict([('name', group.name), ('group_id', group.id), ('owner_id', u'111122223333'), -- ('description', group.description), -- ('rules', [{'to_port': to_port, 'from_port': from_port, -- 'ip_protocol': ip_protocol, 'cidr_ip': cidr_ip}]), -- ('rules_egress', rules_egress)]) -- secgroup_get_config_result = boto_secgroup.get_config(group_id=group.id, **conn_parameters) -- self.assertEqual(expected_get_config_result, secgroup_get_config_result) -- - @skipIf(True, 'test skipped due to error in moto return - fixed in ' - 'https://github.com/spulec/moto/commit/cc0166964371f7b5247a49d45637a8f936ccbe6f') - @mock_ec2 diff --git a/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch b/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch deleted file mode 100644 index 7d8512b14ef4..000000000000 --- a/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/tests/unit/states/boto_vpc_test.py b/tests/unit/states/boto_vpc_test.py -index 53b6a24e4d..96b5630627 100644 ---- a/tests/unit/states/boto_vpc_test.py -+++ b/tests/unit/states/boto_vpc_test.py -@@ -179,16 +179,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin): - self.assertTrue(exists) - - @mock_ec2 -- def test_present_when_resource_exists(self): -- vpc = self._create_vpc(name='test') -- resource = self._create_resource(vpc_id=vpc.id, name='test') -- with patch.dict('salt.utils.boto.__salt__', funcs): -- resource_present_result = salt_states['boto_vpc.{0}_present'.format(self.resource_type)]( -- name='test', vpc_name='test', **self.extra_kwargs) -- self.assertTrue(resource_present_result['result']) -- self.assertEqual(resource_present_result['changes'], {}) -- -- @mock_ec2 - @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493') - def test_present_with_failure(self): - vpc = self._create_vpc(name='test') -@@ -210,18 +200,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin): - self.assertEqual(resource_absent_result['changes'], {}) - - @mock_ec2 -- def test_absent_when_resource_exists(self): -- vpc = self._create_vpc(name='test') -- self._create_resource(vpc_id=vpc.id, name='test') -- -- with patch.dict('salt.utils.boto.__salt__', funcs): -- resource_absent_result = salt_states['boto_vpc.{0}_absent'.format(self.resource_type)]('test') -- self.assertTrue(resource_absent_result['result']) -- self.assertEqual(resource_absent_result['changes']['new'][self.resource_type], None) -- exists = funcs['boto_vpc.resource_exists'](self.resource_type, 'test').get('exists') -- self.assertFalse(exists) -- -- @mock_ec2 - @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493') - def test_absent_with_failure(self): - vpc = self._create_vpc(name='test') -@@ -293,28 +271,3 @@ class BotoVpcRouteTableTestCase(BotoVpcStateTestCaseBase, BotoVpcResourceTestCas - - new_subnets = changes['new']['subnets_associations'] - self.assertEqual(new_subnets[0]['subnet_id'], subnet2.id) -- -- @mock_ec2 -- def test_present_with_routes(self): -- vpc = self._create_vpc(name='test') -- igw = self._create_internet_gateway(name='test', vpc_id=vpc.id) -- -- route_table_present_result = salt_states['boto_vpc.route_table_present']( -- name='test', vpc_name='test', routes=[{'destination_cidr_block': '0.0.0.0/0', -- 'gateway_id': igw.id}, -- {'destination_cidr_block': '10.0.0.0/24', -- 'gateway_id': 'local'}]) -- routes = [x['gateway_id'] for x in route_table_present_result['changes']['new']['routes']] -- -- self.assertEqual(set(routes), set(['local', igw.id])) -- -- route_table_present_result = salt_states['boto_vpc.route_table_present']( -- name='test', vpc_name='test', routes=[{'destination_cidr_block': '10.0.0.0/24', -- 'gateway_id': 'local'}]) -- -- changes = route_table_present_result['changes'] -- -- old_routes = [x['gateway_id'] for x in changes['old']['routes']] -- self.assertEqual(set(routes), set(old_routes)) -- -- self.assertEqual(changes['new']['routes'][0]['gateway_id'], 'local') diff --git a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch deleted file mode 100644 index df9e0f66d005..000000000000 --- a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aa87d67258a5b6742fc53d06c7bdac0f643bc9f1 Mon Sep 17 00:00:00 2001 -From: Ch3LL <megan.wilhite@gmail.com> -Date: Tue, 1 Aug 2017 13:44:32 -0400 -Subject: [PATCH] Add clean_id function to salt.utils.verify.py - ---- - salt/utils/verify.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/salt/utils/verify.py b/salt/utils/verify.py -index 5cac0fa651b..a3dc67db336 100644 ---- a/salt/utils/verify.py -+++ b/salt/utils/verify.py -@@ -484,12 +484,21 @@ def clean_path(root, path, subdir=False): - return '' - - -+def clean_id(id_): -+ ''' -+ Returns if the passed id is clean. -+ ''' -+ if re.search(r'\.\.{sep}'.format(sep=os.sep), id_): -+ return False -+ return True -+ -+ - def valid_id(opts, id_): - ''' - Returns if the passed id is valid - ''' - try: -- return bool(clean_path(opts['pki_dir'], id_)) -+ return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_) - except (AttributeError, KeyError) as e: - return False - diff --git a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch deleted file mode 100644 index 871551e0e508..000000000000 --- a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py -index 615e6b5..fbd24aa 100644 ---- a/tests/unit/modules/qemu_nbd_test.py -+++ b/tests/unit/modules/qemu_nbd_test.py -@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase): - Test if it mount the named image via qemu-nbd - and return the mounted roots - ''' -+ tmpdir = os.environ.get('TMPDIR', '/tmp') - mock = MagicMock(return_value=True) - with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}): - self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '') -@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase): - 'mount.mount': mock, - 'cmd.retcode': MagicMock(side_effect=[1, 0])}): - self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'), -- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'}) -+ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'}) - - # 'clear' function tests: 1 - -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index 63e4a53..20b196f 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -26,7 +26,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui - - # Globals - archive.__salt__ = {} --archive.__opts__ = {"cachedir": "/tmp", "test": False} -+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False} - archive.__env__ = 'test' - - -@@ -75,7 +75,7 @@ class ArchiveTestCase(TestCase): - 'cmd.run_all': mock_run}): - filename = os.path.join( - tmp_dir, -- 'files/test/_tmp_test_archive_.tar' -+ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar' - ) - for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): - ret = archive.extracted(tmp_dir, -diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py -index 71e4330..d6f3f30 100644 ---- a/tests/unit/utils/context_test.py -+++ b/tests/unit/utils/context_test.py -@@ -18,7 +18,7 @@ import salt.payload - import salt.utils - - __context__ = {'a': 'b'} --__opts__ = {'cachedir': '/tmp'} -+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')} - - - @skipIf(NO_MOCK, NO_MOCK_REASON) diff --git a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch deleted file mode 100644 index c27227571ad2..000000000000 --- a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py -index 9d2fa3ada7..710bbd75a5 100644 ---- a/tests/unit/modules/inspect_collector_test.py -+++ b/tests/unit/modules/inspect_collector_test.py -@@ -36,28 +36,6 @@ class InspectorCollectorTestCase(TestCase): - self.assertEqual(inspector.dbfile, '/foo/cache/_minion_collector.db') - self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid') - -- def test_file_tree(self): -- ''' -- Test file tree. -- -- :return: -- ''' -- -- inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid') -- tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test') -- expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'], -- ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'], -- ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4', -- '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3']) -- tree_result = [] -- for chunk in inspector._get_all_files(tree_root): -- buff = [] -- for pth in chunk: -- buff.append(pth.replace(tree_root, '')) -- tree_result.append(buff) -- tree_result = tuple(tree_result) -- self.assertEqual(expected_tree, tree_result) -- - def test_get_unmanaged_files(self): - ''' - Test get_unmanaged_files. diff --git a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch deleted file mode 100644 index dce4f09f2a0f..000000000000 --- a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py -index 615e6b5670..fbd24aab86 100644 ---- a/tests/unit/modules/qemu_nbd_test.py -+++ b/tests/unit/modules/qemu_nbd_test.py -@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase): - Test if it mount the named image via qemu-nbd - and return the mounted roots - ''' -+ tmpdir = os.environ.get('TMPDIR', '/tmp') - mock = MagicMock(return_value=True) - with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}): - self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '') -@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase): - 'mount.mount': mock, - 'cmd.retcode': MagicMock(side_effect=[1, 0])}): - self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'), -- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'}) -+ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'}) - - # 'clear' function tests: 1 - -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index e699362d8a..c7c7e8a965 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -25,7 +25,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui - - # Globals - archive.__salt__ = {} --archive.__opts__ = {"cachedir": "/tmp", "test": False} -+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False} - archive.__env__ = 'test' - - -diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py -index 5249d56747..a27ee9ab61 100644 ---- a/tests/unit/utils/context_test.py -+++ b/tests/unit/utils/context_test.py -@@ -18,7 +18,7 @@ import salt.payload - import salt.utils - - __context__ = {'a': 'b'} --__opts__ = {'cachedir': '/tmp'} -+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')} - - - @skipIf(NO_MOCK, NO_MOCK_REASON) diff --git a/app-admin/salt/salt-2016.11.8-r1.ebuild b/app-admin/salt/salt-2016.11.8-r1.ebuild deleted file mode 100644 index 9376c0488269..000000000000 --- a/app-admin/salt/salt-2016.11.8-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" - "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # https://github.com/saltstack/salt/issues/39095 - rm tests/unit/utils/parsers_test.py - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die - - # allow the use of the renamed msgpack - sed -i '/^msgpack/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2017.7.4-r2.ebuild b/app-admin/salt/salt-2017.7.5.ebuild index 025aeabac2d4..90c568f5533f 100644 --- a/app-admin/salt/salt-2017.7.4-r2.ebuild +++ b/app-admin/salt/salt-2017.7.5.ebuild @@ -28,6 +28,7 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + <dev-python/msgpack-0.5.5[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] @@ -50,7 +51,10 @@ RDEPEND="sys-apps/pciutils ) zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + || ( + dev-python/pycryptodome[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) @@ -77,7 +81,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/timelib[${PYTHON_USEDEP}] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) diff --git a/app-admin/salt/salt-2017.7.2-r2.ebuild b/app-admin/salt/salt-2018.3.0.ebuild index 19e8be7ea3d4..a9d68684042c 100644 --- a/app-admin/salt/salt-2017.7.2-r2.ebuild +++ b/app-admin/salt/salt-2018.3.0.ebuild @@ -27,12 +27,15 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + <dev-python/msgpack-0.5.5[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + <www-servers/tornado-5.0[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) mako? ( dev-python/mako[${PYTHON_USEDEP}] ) @@ -49,11 +52,19 @@ RDEPEND="sys-apps/pciutils ) zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + || ( + dev-python/pycryptodome[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + portage? ( + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + ) + ) keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) @@ -69,9 +80,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pytest-salt[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-catchlog[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/timelib[${PYTHON_USEDEP}] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) @@ -87,14 +99,17 @@ REQUIRED_USE="|| ( raet zeromq )" RESTRICT="x86? ( test )" PATCHES=( - "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/salt-2017.7.2-fix_disk_format.patch" + "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/${PN}-2017.7.3-tests.patch" ) python_prepare() { + # remove tests with external dependencies that may not be available rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die rm tests/unit/states/test_boto_vpc.py || die + rm tests/unit/modules/test_{kubernetes,vsphere}.py || die + # allow the use of the renamed msgpack sed -i '/^msgpack/d' requirements/base.txt || die } |