commit: c5dea8a8747baaf3792c03dd2f8bc297ad1da531 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Dec 3 11:26:19 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Dec 3 11:26:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dea8a8
app-admin/diamond: fix tests, bug #639586 Closes: https://bugs.gentoo.org/639586 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-admin/diamond/Manifest | 4 ++-- app-admin/diamond/diamond-4.0.515.ebuild | 9 ++++++++- app-admin/diamond/diamond-9999.ebuild | 11 +++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index 3ca8ebfc740..3cfe85f452f 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -1,2 +1,2 @@ -DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e -DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba +DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 +DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild index a10298e45b4..6c874d48ed2 100644 --- a/app-admin/diamond/diamond-4.0.515.ebuild +++ b/app-admin/diamond/diamond-4.0.515.ebuild @@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 )" DEPEND="${RDEPEND} - test? ( dev-python/mock )" + test? ( + dev-python/mock + dev-python/pysnmp + )" src_prepare() { # adjust for Prefix @@ -48,6 +51,10 @@ src_prepare() { } python_test() { + # don't want to depend on docker for just this + mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die + # fails on binding ports + mv src/collectors/portstat/tests/{test,no}_portstat.py || die "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" } diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild index c37ee683c29..57df76bc074 100644 --- a/app-admin/diamond/diamond-9999.ebuild +++ b/app-admin/diamond/diamond-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 )" DEPEND="${RDEPEND} - test? ( dev-python/mock )" + test? ( + dev-python/mock + dev-python/pysnmp + )" src_prepare() { # adjust for Prefix @@ -42,6 +45,10 @@ src_prepare() { } python_test() { + # don't want to depend on docker for just this + mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die + # fails on binding ports + mv src/collectors/portstat/tests/{test,no}_portstat.py || die "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" }
