mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-admin/salt: Version bump to 2016.11.0
Package-Manager: portage-2.3.2
This commit is contained in:
Patrick McLean
@@ -1,3 +1,4 @@
|
||||
DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86
|
||||
DIST salt-2015.8.12.tar.gz 7033938 SHA256 712f72b30a9555ea46a51bc677e05ffa2eefaeefa6b48d4f7ae45dbcb1073c69 SHA512 8ce940a413c740bd82c6c96103d48b376a47cb8161a5d72ece3f4bf6b39134bd722787a427249726dc137064d032fa913c7f6c6db22d0808ba1a829d4f25e9ec WHIRLPOOL 723660eac1346c3ba29b88c7db1a4485a194aebbdf33ea6dc411c420059767a3feb5c863941d772b504cede4a78a57e3ce696601872d21d29f4def373db697d4
|
||||
DIST salt-2016.11.0.tar.gz 9044879 SHA256 b516285926ee95cedc64ecddab05d14422b7c8819c9f6d046a431c41d608e6bc SHA512 0cddebe9fda1f7d08aa7ee5d4e49e182c67e7bc179136da30d20c991bc10d7299034198f6721b89eda2604480aa2cfe6960f37fadde4d72adf166a065a9f6443 WHIRLPOOL 595ab7c7e50cafdfc7d69a1e24964a88092e93416dc23b295e1ab59f1ce3ae8fa10b24c4e9fe45c1d2d8557290aceae66f93d3da81a1f1be62c98e537cb8ad6a
|
||||
DIST salt-2016.3.4.tar.gz 8354090 SHA256 5d4c822719d7fb2d79b0103cd9b015d251300890f8aa174e16b73fcfd6eb22f9 SHA512 ca17c5607d23d09e95fb4b6afbcf1b4f0be6bab47ff3eee883c1464e13b5271b71f0e7bedfa8afe05f32bf3a0a6f4050a91afb9285b52aa0f3da6105221397e0 WHIRLPOOL 95347b1f8447e8701074727430ef0a232e92aa9e961451c445890552c6d9533569e470dfa4864f673c6c3b3eccb16ec9c3615cfcab6d29e74756861afe43fcac
|
||||
|
||||
23
app-admin/salt/files/salt-2016.11.0-broken-tests.patch
Normal file
23
app-admin/salt/files/salt-2016.11.0-broken-tests.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
diff --git a/tests/unit/utils/extend_test.py b/tests/unit/utils/extend_test.py
|
||||
index f63a4896f7..54bf443d9a 100644
|
||||
--- a/tests/unit/utils/extend_test.py
|
||||
+++ b/tests/unit/utils/extend_test.py
|
||||
@@ -38,18 +38,6 @@ class ExtendTestCase(TestCase):
|
||||
shutil.rmtree(self.out, True)
|
||||
os.chdir(self.starting_dir)
|
||||
|
||||
- @patch('sys.exit', MagicMock)
|
||||
- def test_run(self):
|
||||
- out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
|
||||
- self.out = out
|
||||
- year = date.today().strftime('%Y')
|
||||
- self.assertTrue(os.path.exists(out))
|
||||
- self.assertFalse(os.path.exists(os.path.join(out, 'template.yml')))
|
||||
- self.assertTrue(os.path.exists(os.path.join(out, 'directory')))
|
||||
- self.assertTrue(os.path.exists(os.path.join(out, 'directory', 'test.py')))
|
||||
- with salt.utils.fopen(os.path.join(out, 'directory', 'test.py'), 'r') as test_f:
|
||||
- self.assertEqual(test_f.read(), year)
|
||||
-
|
||||
if __name__ == '__main__':
|
||||
from unit import run_tests
|
||||
run_tests(ExtendTestCase, needs_daemon=False)
|
||||
@@ -0,0 +1,34 @@
|
||||
diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
|
||||
index 9105670526..e077bc3f44 100644
|
||||
--- a/tests/unit/modules/inspect_collector_test.py
|
||||
+++ b/tests/unit/modules/inspect_collector_test.py
|
||||
@@ -52,29 +52,6 @@ class InspectorCollectorTestCase(TestCase):
|
||||
self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
|
||||
|
||||
@patch("os.mkdir", MagicMock())
|
||||
- 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)
|
||||
-
|
||||
- @patch("os.mkdir", MagicMock())
|
||||
def test_get_unmanaged_files(self):
|
||||
'''
|
||||
Test get_unmanaged_files.
|
||||
34
app-admin/salt/files/salt-2016.11.0-tmpdir.patch
Normal file
34
app-admin/salt/files/salt-2016.11.0-tmpdir.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
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/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)
|
||||
144
app-admin/salt/salt-2016.11.0.ebuild
Normal file
144
app-admin/salt/salt-2016.11.0.ebuild
Normal file
@@ -0,0 +1,144 @@
|
||||
# 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}-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
|
||||
|
||||
# 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"
|
||||
}
|
||||
Reference in New Issue
Block a user