Skip to content

Commit 34b1bec

Browse files
authored
Merge pull request #39 from 130s/k/rm_metapkg
Remove meaningless metapkg.
2 parents dc584c9 + 3a7b40c commit 34b1bec

File tree

6 files changed

+8
-78
lines changed

6 files changed

+8
-78
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ env:
2121
matrix:
2222
allow_failures:
2323
- env: ROS_DISTRO="kinetic" PRERELEASE=true
24-
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true NOT_TEST_INSTALL=true
25-
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu USE_DEB=true NOT_TEST_INSTALL=true VERBOSE_OUTPUT='true'
2624
- env: ROS_DISTRO="lunar" PRERELEASE=true
2725
install:
2826
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config

ar_track_alvar/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ if (CATKIN_ENABLE_TESTING)
164164

165165
file(GLOB LAUNCH_FILES launch/*.launch test/*.test)
166166
foreach(LAUNCH_FILE ${LAUNCH_FILES})
167-
roslaunch_add_file_check(${LAUNCH_FILE})
167+
roslaunch_add_file_check(${LAUNCH_FILE} USE_TEST_DEPENDENCIES)
168168
endforeach()
169169

170170
catkin_download_test_data(

ar_track_alvar/test/test_ar.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3535
# POSSIBILITY OF SUCH DAMAGE.
3636

37+
import numpy
3738
import math
3839
import unittest
3940

@@ -78,7 +79,7 @@ def test_markers(self):
7879
# The values in this list are ordered in the marker's number.
7980
tf_expected = [[[0.04464459977845401, 0.05341412598745035, 0.26796900627543024], [0.6726999185589797, 0.7391474391806558, -0.01739267319701629, -0.028868280906256056]],
8081
[[-0.04805772245624329, 0.039528315926071665, 0.26775882622136327], [0.48207151562664247, 0.8758763282975102, -0.016363763970395625, -0.013414118615296202]],
81-
[[0.007233278235745441, 0.015615692018491452, 0.26619586686955365], [0.08546919545682985, 0.9959809257461487, -0.0001615529469785548, -0.02677659572186436]],
82+
[[0.007233278235745441, 0.015615692018491452, 0.26619586686955365], [0.08546919545682985, 0.9959809257461487, 0.00424040439, -0.02677659572186436]],
8283
[[0.06223014382428272, 0.014613815037010106, 0.26226145707174475], [-0.46400320825216246, 0.8850390875261293, 0.032644264656690035, -0.018471282241381157]]]
8384
for i in range (0, len(tf_expected)):
8485
while not rospy.is_shutdown():
@@ -91,10 +92,13 @@ def test_markers(self):
9192
continue
9293
# Compare each translation element (x, y, z)
9394
for v_ret, v_expected in zip(trans, tf_expected[i][0]):
94-
self.assertAlmostEqual(v_ret, v_expected, 2)
95+
# Given that sigfig ignores the leading zero, we only compare the first sigfig.
96+
numpy.testing.assert_approx_equal(
97+
v_ret, v_expected, significant=1)
9598
# Compare each orientation element (x, y, z, w)
9699
for v_ret, v_expected in zip(rot, tf_expected[i][1]):
97-
self.assertAlmostEqual(v_ret, v_expected, 2)
100+
numpy.testing.assert_approx_equal(
101+
v_ret, v_expected, significant=1)
98102

99103
if __name__ == '__main__':
100104
import rostest

ar_track_alvar_metapkg/CHANGELOG.rst

Lines changed: 0 additions & 50 deletions
This file was deleted.

ar_track_alvar_metapkg/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

ar_track_alvar_metapkg/package.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)