commit: ac688fa8d36626f5a8482ba4af26531546eadc68 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Thu Dec 1 01:12:13 2016 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu Dec 1 01:15:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac688fa8
app-admin/salt: Version bump to 2016.3.4 Package-Manager: portage-2.3.2 app-admin/salt/Manifest | 1 + .../files/salt-2016.3.4-dont-test-ordering.patch | 33 +++++ .../files/salt-2016.3.4-test-nonexist-dirs.patch | 32 +++++ app-admin/salt/salt-2016.3.4.ebuild | 143 +++++++++++++++++++++ 4 files changed, 209 insertions(+) diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 2d46956..19789c7 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -6,3 +6,4 @@ DIST salt-2015.8.8.tar.gz 6982904 SHA256 b2ecce7bf562cfcd6586d66ade278f268bb8902 DIST salt-2016.3.1.tar.gz 7932479 SHA256 e6bdba4693116430c2af57497eb63399e3a139ac0a7016fa0870b49fbe987f75 SHA512 74122020a83df79171b9aa3bc311d1b16930140ec6b063c888d41e10fb8e696f69188b62cf925045b40d8b8fe713759de08978b08bc3b8e1f12722de3a8ddb7b WHIRLPOOL f76afb4d9c6678edf48b608f6dbd27201656fd371b0df78a8a8db306a2cbf5b08fa2fd916e9fb5409b67cd05ab007a3684d91c1e0158416b12f014001de1506a DIST salt-2016.3.2.tar.gz 8014793 SHA256 6a84b724d02b0dba438dea57650724064675d82620e66749bd2fe8f21da71be0 SHA512 608e2a43bc8c55eeb8c9e0f9207306e591151940ad1ffb869ada12963c0790f37653936e539c0b70439c13180909de2c763db6c30e7f9e2087068985d1b3ff91 WHIRLPOOL 5e6f6dc9980ab6cd6e8c897d140241ce9e6dec8afd08274749a20260c6b871d6e52cd674ed8e838a4aa285bf45c49586d77bc2156f94ee26f4f776d9025040eb DIST salt-2016.3.3.tar.gz 7952361 SHA256 5906038594f1b9b3ac41714774fbd78f0af80d2f3ffe1c1bf20308032d7d52b6 SHA512 46a8f8b3213e4cc02eaed95e7fc28ce224fe07fe2aea39b68ff3e97043021951558f04690f7043510c8dfb62d76fe82192d67de6151c7f1076a23c0f8d796c9e WHIRLPOOL dc21ca7d996b5f59501e4658a38fee8d1bdd20669059b72781a4e7e4c91b2fc40f267a533f6974c26a70b4dd8ac20d93174d1a8d9c04d351af0a47dc53572379 +DIST salt-2016.3.4.tar.gz 8354090 SHA256 5d4c822719d7fb2d79b0103cd9b015d251300890f8aa174e16b73fcfd6eb22f9 SHA512 ca17c5607d23d09e95fb4b6afbcf1b4f0be6bab47ff3eee883c1464e13b5271b71f0e7bedfa8afe05f32bf3a0a6f4050a91afb9285b52aa0f3da6105221397e0 WHIRLPOOL 95347b1f8447e8701074727430ef0a232e92aa9e961451c445890552c6d9533569e470dfa4864f673c6c3b3eccb16ec9c3615cfcab6d29e74756861afe43fcac 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 new file mode 100644 index 00000000..c272275 --- /dev/null +++ b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch @@ -0,0 +1,33 @@ +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.4-test-nonexist-dirs.patch b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch new file mode 100644 index 00000000..dd542d6 --- /dev/null +++ b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch @@ -0,0 +1,32 @@ +diff --git a/tests/unit/conf_test.py b/tests/unit/conf_test.py +index cce0023423..c1324f4a61 100644 +--- a/tests/unit/conf_test.py ++++ b/tests/unit/conf_test.py +@@ -140,6 +140,8 @@ class ConfTest(TestCase): + commented out. This test loops through all of the files in that directory to check + for any lines that are not commented or blank. + ''' ++ if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.profiles.d/'): ++ return + cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/') + for conf_file in cloud_sample_files: + profile_conf = SAMPLE_CONF_DIR + 'cloud.profiles.d/' + conf_file +@@ -158,6 +160,8 @@ class ConfTest(TestCase): + commented out. This test loops through all of the files in that directory to check + for any lines that are not commented or blank. + ''' ++ if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.providers.d/'): ++ return + cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/') + for conf_file in cloud_sample_files: + provider_conf = SAMPLE_CONF_DIR + 'cloud.providers.d/' + conf_file +@@ -176,6 +180,9 @@ class ConfTest(TestCase): + commented out. This test loops through all of the files in that directory to check + for any lines that are not commented or blank. + ''' ++ if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.maps.d/'): ++ return ++ + cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/') + for conf_file in cloud_sample_files: + map_conf = SAMPLE_CONF_DIR + 'cloud.maps.d/' + conf_file diff --git a/app-admin/salt/salt-2016.3.4.ebuild b/app-admin/salt/salt-2016.3.4.ebuild new file mode 100644 index 00000000..14593b8 --- /dev/null +++ b/app-admin/salt/salt-2016.3.4.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="http://saltstack.org/"; + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://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}-2015.8.2-tmpdir.patch" + "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" + "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" + "${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.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 + + # 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 +} + +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" +}
