From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6DACF1395E2 for ; Fri, 2 Dec 2016 00:50:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B2D2E083A; Fri, 2 Dec 2016 00:50:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4335BE083A for ; Fri, 2 Dec 2016 00:50:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DEB534105A for ; Fri, 2 Dec 2016 00:50:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7491A49D for ; Fri, 2 Dec 2016 00:50:46 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1480639825.ef96b71d7cce0525cb76025ccb67a5f08f4e4d72.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/salt-9999.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: ef96b71d7cce0525cb76025ccb67a5f08f4e4d72 X-VCS-Branch: master Date: Fri, 2 Dec 2016 00:50:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 68b7d6d4-5166-4996-8b0f-47261e498aa2 X-Archives-Hash: 17094d91e5a9974ea857565a43f7c198 commit: ef96b71d7cce0525cb76025ccb67a5f08f4e4d72 Author: Patrick McLean gentoo org> AuthorDate: Fri Dec 2 00:50:25 2016 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Dec 2 00:50:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef96b71d app-admin/salt: Sync 9999 ebuild to latest version Package-Manager: portage-2.3.2 app-admin/salt/salt-9999.ebuild | 51 ++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild index fa3262c..f6ea995 100644 --- a/app-admin/salt/salt-9999.ebuild +++ b/app-admin/salt/salt-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -PYTHON_COMPAT=(python2_7) +EAPI=6 +PYTHON_COMPAT=( python2_7 ) inherit eutils systemd distutils-r1 @@ -24,7 +24,7 @@ fi LICENSE="Apache-2.0" SLOT="0" IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax" +IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] @@ -38,7 +38,7 @@ RDEPEND="sys-apps/pciutils libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) mako? ( dev-python/mako[${PYTHON_USEDEP}] ) ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) openssl? ( dev-libs/openssl:*[-bindist] @@ -55,6 +55,7 @@ RDEPEND="sys-apps/pciutils ) 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}] ) @@ -67,24 +68,34 @@ RDEPEND="sys-apps/pciutils 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-2015.2.16[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ${RDEPEND} )" -DOCS=(README.rst AUTHORS) +DOCS=( README.rst AUTHORS ) REQUIRED_USE="|| ( raet zeromq )" +RESTRICT="x86? ( test )" 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 + 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() { @@ -102,11 +113,25 @@ python_install_all() { } python_test() { + local tempdir # testsuite likes lots of files - ulimit -n 3072 + 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 - # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX - USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose || die "testing failed" + ) || die "testing failed" }