| 1 |
commit: c5dea8a8747baaf3792c03dd2f8bc297ad1da531 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 3 11:26:19 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 3 11:26:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dea8a8 |
| 7 |
|
| 8 |
app-admin/diamond: fix tests, bug #639586 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/639586 |
| 11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 12 |
|
| 13 |
app-admin/diamond/Manifest | 4 ++-- |
| 14 |
app-admin/diamond/diamond-4.0.515.ebuild | 9 ++++++++- |
| 15 |
app-admin/diamond/diamond-9999.ebuild | 11 +++++++++-- |
| 16 |
3 files changed, 19 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest |
| 19 |
index 3ca8ebfc740..3cfe85f452f 100644 |
| 20 |
--- a/app-admin/diamond/Manifest |
| 21 |
+++ b/app-admin/diamond/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
-DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e |
| 24 |
-DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba |
| 25 |
+DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 |
| 26 |
+DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b |
| 27 |
|
| 28 |
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild |
| 29 |
index a10298e45b4..6c874d48ed2 100644 |
| 30 |
--- a/app-admin/diamond/diamond-4.0.515.ebuild |
| 31 |
+++ b/app-admin/diamond/diamond-4.0.515.ebuild |
| 32 |
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj |
| 33 |
redis? ( dev-python/redis-py ) |
| 34 |
!kernel_linux? ( >=dev-python/psutil-3 )" |
| 35 |
DEPEND="${RDEPEND} |
| 36 |
- test? ( dev-python/mock )" |
| 37 |
+ test? ( |
| 38 |
+ dev-python/mock |
| 39 |
+ dev-python/pysnmp |
| 40 |
+ )" |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
# adjust for Prefix |
| 44 |
@@ -48,6 +51,10 @@ src_prepare() { |
| 45 |
} |
| 46 |
|
| 47 |
python_test() { |
| 48 |
+ # don't want to depend on docker for just this |
| 49 |
+ mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die |
| 50 |
+ # fails on binding ports |
| 51 |
+ mv src/collectors/portstat/tests/{test,no}_portstat.py || die |
| 52 |
"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" |
| 53 |
} |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild |
| 57 |
index c37ee683c29..57df76bc074 100644 |
| 58 |
--- a/app-admin/diamond/diamond-9999.ebuild |
| 59 |
+++ b/app-admin/diamond/diamond-9999.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2015 Gentoo Foundation |
| 62 |
+# Copyright 1999-2017 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=5 |
| 66 |
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj |
| 67 |
redis? ( dev-python/redis-py ) |
| 68 |
!kernel_linux? ( >=dev-python/psutil-3 )" |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
- test? ( dev-python/mock )" |
| 71 |
+ test? ( |
| 72 |
+ dev-python/mock |
| 73 |
+ dev-python/pysnmp |
| 74 |
+ )" |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
# adjust for Prefix |
| 78 |
@@ -42,6 +45,10 @@ src_prepare() { |
| 79 |
} |
| 80 |
|
| 81 |
python_test() { |
| 82 |
+ # don't want to depend on docker for just this |
| 83 |
+ mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die |
| 84 |
+ # fails on binding ports |
| 85 |
+ mv src/collectors/portstat/tests/{test,no}_portstat.py || die |
| 86 |
"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" |
| 87 |
} |
Archives