| 1 |
commit: a14fe43dc734c48823b95db6096d7a3a30895202 |
| 2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 4 13:40:28 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 4 14:21:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14fe43d |
| 7 |
|
| 8 |
dev-util/rosdep: cleanup tests |
| 9 |
|
| 10 |
- Use new feature of PROPERTIES="test_network" |
| 11 |
- use cleaner unset ROS_DISTRO |
| 12 |
|
| 13 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/rosdep/rosdep-0.21.0.ebuild | 19 +++++++++---------- |
| 16 |
dev-util/rosdep/rosdep-9999.ebuild | 19 +++++++++---------- |
| 17 |
2 files changed, 18 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/rosdep/rosdep-0.21.0.ebuild b/dev-util/rosdep/rosdep-0.21.0.ebuild |
| 20 |
index 8e8c536d355..12ed94c4c91 100644 |
| 21 |
--- a/dev-util/rosdep/rosdep-0.21.0.ebuild |
| 22 |
+++ b/dev-util/rosdep/rosdep-0.21.0.ebuild |
| 23 |
@@ -26,17 +26,17 @@ fi |
| 24 |
|
| 25 |
LICENSE="BSD" |
| 26 |
SLOT="0" |
| 27 |
-IUSE="test" |
| 28 |
-RESTRICT="!test? ( test )" |
| 29 |
+ |
| 30 |
+# Tests need network |
| 31 |
+RESTRICT="test" |
| 32 |
+PROPERTIES="test_network" |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
dev-python/catkin_pkg[${PYTHON_USEDEP}] |
| 36 |
dev-python/rospkg[${PYTHON_USEDEP}] |
| 37 |
dev-python/rosdistro[${PYTHON_USEDEP}] |
| 38 |
dev-python/pyyaml[${PYTHON_USEDEP}]" |
| 39 |
-DEPEND="${RDEPEND}" |
| 40 |
BDEPEND=" |
| 41 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 42 |
test? ( |
| 43 |
dev-python/mock[${PYTHON_USEDEP}] |
| 44 |
dev-python/flake8[${PYTHON_USEDEP}] |
| 45 |
@@ -44,12 +44,11 @@ BDEPEND=" |
| 46 |
" |
| 47 |
PATCHES=( "${FILESDIR}/tests.patch" ) |
| 48 |
|
| 49 |
-python_test() { |
| 50 |
- if has network-sandbox ${FEATURES}; then |
| 51 |
- einfo "Skipping tests due to network sandbox" |
| 52 |
- else |
| 53 |
- env -u ROS_DISTRO nosetests --with-xunit test || die |
| 54 |
- fi |
| 55 |
+distutils_enable_tests nose |
| 56 |
+ |
| 57 |
+src_test() { |
| 58 |
+ unset ROS_DISTRO |
| 59 |
+ distutils-r1_src_test |
| 60 |
} |
| 61 |
|
| 62 |
pkg_postrm() { |
| 63 |
|
| 64 |
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild |
| 65 |
index 8e8c536d355..12ed94c4c91 100644 |
| 66 |
--- a/dev-util/rosdep/rosdep-9999.ebuild |
| 67 |
+++ b/dev-util/rosdep/rosdep-9999.ebuild |
| 68 |
@@ -26,17 +26,17 @@ fi |
| 69 |
|
| 70 |
LICENSE="BSD" |
| 71 |
SLOT="0" |
| 72 |
-IUSE="test" |
| 73 |
-RESTRICT="!test? ( test )" |
| 74 |
+ |
| 75 |
+# Tests need network |
| 76 |
+RESTRICT="test" |
| 77 |
+PROPERTIES="test_network" |
| 78 |
|
| 79 |
RDEPEND=" |
| 80 |
dev-python/catkin_pkg[${PYTHON_USEDEP}] |
| 81 |
dev-python/rospkg[${PYTHON_USEDEP}] |
| 82 |
dev-python/rosdistro[${PYTHON_USEDEP}] |
| 83 |
dev-python/pyyaml[${PYTHON_USEDEP}]" |
| 84 |
-DEPEND="${RDEPEND}" |
| 85 |
BDEPEND=" |
| 86 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 87 |
test? ( |
| 88 |
dev-python/mock[${PYTHON_USEDEP}] |
| 89 |
dev-python/flake8[${PYTHON_USEDEP}] |
| 90 |
@@ -44,12 +44,11 @@ BDEPEND=" |
| 91 |
" |
| 92 |
PATCHES=( "${FILESDIR}/tests.patch" ) |
| 93 |
|
| 94 |
-python_test() { |
| 95 |
- if has network-sandbox ${FEATURES}; then |
| 96 |
- einfo "Skipping tests due to network sandbox" |
| 97 |
- else |
| 98 |
- env -u ROS_DISTRO nosetests --with-xunit test || die |
| 99 |
- fi |
| 100 |
+distutils_enable_tests nose |
| 101 |
+ |
| 102 |
+src_test() { |
| 103 |
+ unset ROS_DISTRO |
| 104 |
+ distutils-r1_src_test |
| 105 |
} |
| 106 |
|
| 107 |
pkg_postrm() { |
Archives