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 84B0F139083 for ; Sun, 3 Dec 2017 11:27:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C95CCE0F53; Sun, 3 Dec 2017 11:27:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 969B5E0F53 for ; Sun, 3 Dec 2017 11:27:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EB1033BF3C for ; Sun, 3 Dec 2017 11:27:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE238AD74 for ; Sun, 3 Dec 2017 11:27:05 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1512300410.c5dea8a8747baaf3792c03dd2f8bc297ad1da531.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/diamond/Manifest app-admin/diamond/diamond-4.0.515.ebuild app-admin/diamond/diamond-9999.ebuild X-VCS-Directories: app-admin/diamond/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: c5dea8a8747baaf3792c03dd2f8bc297ad1da531 X-VCS-Branch: master Date: Sun, 3 Dec 2017 11:27:05 +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: 5bf463c4-75d8-4f40-b376-c56f430ec43a X-Archives-Hash: fe07a97a6fd3f872d83a46e6288102db commit: c5dea8a8747baaf3792c03dd2f8bc297ad1da531 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 3 11:26:19 2017 +0000 Commit: Fabian Groffen gentoo 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}" }