From d33b3cf6cff9fdbfc8362bf854c3c34b2c28d518 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Apr 2023 00:01:06 +0100 Subject: gentoo auto-resync : 21:04:2023 - 00:01:05 --- app-admin/Manifest.gz | Bin 32081 -> 32083 bytes app-admin/salt/Manifest | 4 + .../salt-3006-skip-tests-that-oom-machine.patch | 21 ++ app-admin/salt/files/salt-3006-tests.patch | 74 +++++++ app-admin/salt/salt-3006.0.ebuild | 226 +++++++++++++++++++++ 5 files changed, 325 insertions(+) create mode 100644 app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch create mode 100644 app-admin/salt/files/salt-3006-tests.patch create mode 100644 app-admin/salt/salt-3006.0.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index de865bff7d89..2e128c94516a 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index c50d16b8232c..79b98bdb8f54 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -14,6 +14,8 @@ AUX salt-3005.1-importlib-metadata-5-r1.patch 1162 BLAKE2B cbc8df0043881725eb00a AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95475834ae917a2f6fbdbe3424c9f1e837a0e797b84e291e3530f86a2f7d2286e0070f433817ec06b2fd4d0a069b47acb1b0646653862337ece SHA512 4bc03979e1a4202d5ccb2b3159e178bc72c2a4be4297d7b9306479a5c7fe8cc81fc7d25474d80c2627e638db25e73cd4e8f7e1b25c8e15317e22986d63307823 AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67 +AUX salt-3006-skip-tests-that-oom-machine.patch 749 BLAKE2B 453e9db439bb87aa949cc150bafc7b39cc69a4e7189115e69bd7571d35c5eb34eba9d80d7ebb21c62bb454bf54217af7f5f8ef366dbeecc5250c1fee1d729420 SHA512 7d68020cc52ecc51e67861ed8465104b92b0c869823501d7966ab42df60f40049e5619453c1cd5238513c5e4afd1d46b1c5e3dd50830604555abd2a111a4601f +AUX salt-3006-tests.patch 3196 BLAKE2B e364ce99d499acef5f337cf82ab670f9693b5bb5cb6db27e4253bcebed6645c189f17579858aca31d549c5386c460a93cfb75f60cbdc715939f90c9c039cad4c SHA512 cd35cef1def946f6354665867fd79c4c8457ea87813a710d9c1ff04bf3341903dc155542e4c2d062ccb7be96147f9892b66d12f573c831b7acb86176afba63c3 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed @@ -21,5 +23,7 @@ AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14 DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50 +DIST salt-3006.0.tar.gz 20377846 BLAKE2B d39a55676f6bc5f70a558684811dd6175b633ceb5b73f4e95bd0137e7a507456f2e77099c05aca082591b9bdff1948632adc9f141e2f8ad26c4bfedd98af3d15 SHA512 999e2eb362607e1a8a0636c3bfa305fb070a5df309b837975a03a0bf02d25e4678eae38e8a1a356ea857a6d81cbb68aeb9f903a55dd221c7485d2f22b309dd77 EBUILD salt-3005.1-r1.ebuild 7220 BLAKE2B 5a045d17bcd6b6402a16963bf6df5875a09cbbaa70d35a8e6e730e918b040aa2905785b766379045f5a2c0c95b438fbd54d5ab256a3dc4a5ad24d7589c5cd479 SHA512 956f1ed2a31cb6962fa90cf63e37bfa4054cc7057305a7ecc957a96f6920f6360acd9b38cef32a56c85ee9117777cafb33f72ce0a6114b0bf39599e0850ed0bf +EBUILD salt-3006.0.ebuild 7286 BLAKE2B fcabca1a5c231ba18e5e79327cdb511206c0b54653b6272df6fed3c8e4e99e6430fb414ccfb8235b48e123b8fe654933872d90f01e2032871757829592d68f18 SHA512 6c86ee63574c73f7dce9b0d9ffe386fe6839bb94cc3e5260a6b1e26f869fa73e2cf4d0126dfb80e690c69c0a756f549c2ef52f08bfc8949c4c77f58b22fa3fe6 MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da diff --git a/app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch new file mode 100644 index 000000000000..0b62cee96f2f --- /dev/null +++ b/app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch @@ -0,0 +1,21 @@ +diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py +index 5f3d2a4982..82366185ff 100644 +--- a/tests/unit/modules/test_boto_apigateway.py ++++ b/tests/unit/modules/test_boto_apigateway.py +@@ -155,7 +155,7 @@ def _has_required_botocore(): + else: + return True + +- ++@pytest.mark.skip("Causes machine to OOM") + class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): + conn = None + +@@ -192,6 +192,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): + self.addCleanup(delattr, self, "utils") + + ++@pytest.mark.skip("Causes machine to OOM") + class BotoApiGatewayTestCaseMixin: + def _diff_list_dicts(self, listdict1, listdict2, sortkey): + """ diff --git a/app-admin/salt/files/salt-3006-tests.patch b/app-admin/salt/files/salt-3006-tests.patch new file mode 100644 index 000000000000..6135ca8c0ea1 --- /dev/null +++ b/app-admin/salt/files/salt-3006-tests.patch @@ -0,0 +1,74 @@ +diff --git a/tests/pytests/unit/modules/test_linux_sysctl.py b/tests/pytests/unit/modules/test_linux_sysctl.py +index 0bdd24039d..22df70c58d 100644 +--- a/tests/pytests/unit/modules/test_linux_sysctl.py ++++ b/tests/pytests/unit/modules/test_linux_sysctl.py +@@ -215,7 +215,7 @@ def test_persist_no_conf_failure(): + ): + with pytest.raises(CommandExecutionError): + linux_sysctl.persist("net.ipv4.ip_forward", 42, config=None) +- fopen_mock.called_once() ++ fopen_mock.assert_called_once() + + + def test_persist_no_conf_success(): +diff --git a/tests/pytests/unit/modules/test_win_ip.py b/tests/pytests/unit/modules/test_win_ip.py +index 38eb6b1ac5..94a3fe7ca9 100644 +--- a/tests/pytests/unit/modules/test_win_ip.py ++++ b/tests/pytests/unit/modules/test_win_ip.py +@@ -151,7 +151,7 @@ def test_enable(): + ): + assert win_ip.enable("Ethernet") + +- mock_cmd.called_once_with( ++ mock_cmd.assert_called_once_with( + [ + "netsh", + "interface", +@@ -180,7 +180,7 @@ def test_disable(): + ): + assert win_ip.disable("Ethernet") + +- mock_cmd.called_once_with( ++ mock_cmd.assert_called_once_with( + [ + "netsh", + "interface", +diff --git a/tests/pytests/unit/test_master.py b/tests/pytests/unit/test_master.py +index cd11d217c7..502767d3e3 100644 +--- a/tests/pytests/unit/test_master.py ++++ b/tests/pytests/unit/test_master.py +@@ -60,7 +60,7 @@ def test_fileserver_duration(): + end = time.time() + # Interval is equal to timeout so the _do_update method will be called + # one time. +- update.called_once() ++ update.assert_called_once() + # Timeout is 1 second + duration = end - start + if duration > 2 and salt.utils.platform.spawning_platform(): +diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py +index e289e72dad..2abd4066c4 100644 +--- a/tests/pytests/unit/utils/event/test_event.py ++++ b/tests/pytests/unit/utils/event/test_event.py +@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError(): + event = SaltEvent(node=None) + with patch.object(event, "pusher") as mock_pusher: + with patch.object( +- salt.utils.event.log, "debug", auto_spec=True ++ salt.utils.event.log, "debug", auto_spec=True, unsafe=True + ) as mock_log_debug: + mock_pusher.connect.side_effect = ( + salt.ext.tornado.iostream.StreamClosedError +@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error): + event = SaltEvent(node=None) + with patch.object(event, "pusher") as mock_pusher: + with patch.object( +- salt.utils.event.log, "debug", auto_spec=True ++ salt.utils.event.log, "debug", auto_spec=True, unsafe=True + ) as mock_log_debug: + with patch.object( +- salt.utils.event.log, "error", auto_spec=True ++ salt.utils.event.log, "error", auto_spec=True, unsafe=True + ) as mock_log_error: + mock_pusher.connect.side_effect = error + event.connect_pull() diff --git a/app-admin/salt/salt-3006.0.ebuild b/app-admin/salt/salt-3006.0.ebuild new file mode 100644 index 000000000000..144d87ed2357 --- /dev/null +++ b/app-admin/salt/salt-3006.0.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_10 ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + >=dev-python/libcloud-2.5.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:0=[-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}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + 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 ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/certifi-2022.12.07[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc21[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/libcloud[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3005.1-no-entry-points.patch" + "${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3006-tests.patch" +) + +python_prepare_all() { + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + rm tests/unit/{test_{zypp_plugins,module_names},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/support/gitfs.py || die + rm tests/pytests/functional/transport/server/test_req_channel.py || die + rm tests/pytests/functional/utils/test_async_event_publisher.py || die + rm tests/pytests/functional/runners/test_winrepo.py || die + rm tests/unit/netapi/rest_tornado/test_saltnado.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + rm -r tests/integration/cloud || die + rm -r tests/kitchen/tests/wordpress/tests || die + rm tests/kitchen/test_kitchen.py || die + rm tests/unit/modules/test_network.py || die + rm tests/pytests/functional/modules/test_pip.py || die + rm tests/pytests/unit/client/ssh/test_ssh.py || die + rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die + + # tests require root access + rm tests/integration/pillar/test_git_pillar.py || die + rm tests/integration/states/test_supervisord.py || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die + # pycryptodome rather than pycryptodomex + find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die + + distutils-r1_python_prepare_all +} + +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-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + # testsuite likes lots of files + ulimit -n 4096 || die + + local -a disable_tests=( + # doesn't like the distutils warning + batch_retcode + multiple_modules_in_batch + # hangs indefinitely + master_type_disable + # needs root + runas_env_sudo_group + # don't like sandbox + split_multibyte_characters_{shiftjis,unicode} + log_sanitize + run_with_pre_flight_args + compile_template_str_mkstemp_cleanup + sync_with_handlers + deferred_write_on_flush + call_apt_dpkg_lock + enforce_nice_config + config_validation + ) + + local textexpr + testexpr=$(printf 'not %s and ' "${disable_tests[@]}") + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + epytest -k "${testexpr%and }" -x + ) +} -- cgit v1.2.3