Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove meaningless metapkg. #39

Merged
merged 5 commits into from
Jun 14, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -21,8 +21,6 @@ env:
matrix:
allow_failures:
- env: ROS_DISTRO="kinetic" PRERELEASE=true
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true NOT_TEST_INSTALL=true
- 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'
- env: ROS_DISTRO="lunar" PRERELEASE=true
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
2 changes: 1 addition & 1 deletion ar_track_alvar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -164,7 +164,7 @@ if (CATKIN_ENABLE_TESTING)

file(GLOB LAUNCH_FILES launch/*.launch test/*.test)
foreach(LAUNCH_FILE ${LAUNCH_FILES})
roslaunch_add_file_check(${LAUNCH_FILE})
roslaunch_add_file_check(${LAUNCH_FILE} USE_TEST_DEPENDENCIES)
endforeach()

catkin_download_test_data(
10 changes: 7 additions & 3 deletions ar_track_alvar/test/test_ar.py
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

import numpy
import math
import unittest

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

if __name__ == '__main__':
import rostest
50 changes: 0 additions & 50 deletions ar_track_alvar_metapkg/CHANGELOG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions ar_track_alvar_metapkg/CMakeLists.txt

This file was deleted.

18 changes: 0 additions & 18 deletions ar_track_alvar_metapkg/package.xml

This file was deleted.