[test] Retry more to fix #115. (#116)

* [test] Retry more to fix #115.
After having relaxed test in #113, it still fails occasionally. Same rationale as in the #113, retry is increased a bit more in this commit.

[test] More retries. Shorter test durations.

* [test] Revert back to try using the recommended {CATKIN_DEVEL_PREFIX, CATKIN_PACKAGE_SHARE_DESTINATION} combination for the downloaded file location.

CMakeLists.txt

@@ -160,7 +160,7 @@ if (CATKIN_ENABLE_TESTING)
     # Workaround the issue http://answers.ros.org/question/253787/accessing-data-downloaded-via-catkin_download_test_data/
     # by downloading into source folder.
     #DESTINATION ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/test
-    DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/test
+    DESTINATION ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/test
     MD5 627aa0316bbfe4334e06023d7c2b4087
    )
   add_rostest(test/marker_arg_config-basic.test DEPENDENCIES ${PROJECT_NAME}_4markers_tork.bag)

test/marker_abstract.launch.xml

@@ -20,7 +20,7 @@
 
   <!-- If 1 or more ar_pose_marker topic is published, that means the marker detection is functioning. -->
   <arg name='TESTNAME_MARKER_DETECTION' value='marker_recog_hz_$(arg suffix_testname)' />
-  <arg name='TESTDURATION' value='10' />
+  <arg name='TESTDURATION' value='7' />
   <test pkg="rostest" type="hztest" test-name="$(arg TESTNAME_MARKER_DETECTION)" name="$(arg TESTNAME_MARKER_DETECTION)" time-limit="$(arg TESTDURATION)" retry="3">
     <param name="topic" value="ar_pose_marker" />
     <param name="hz" value="1.0" />
@@ -29,5 +29,5 @@
     <param name="wait_time" value="$(arg TESTDURATION)" />  <!-- Time for downloading may need to be included in this. -->
   </test>
 
-  <test pkg="ar_track_alvar" type="test_ar.py" test-name="marker_quarternions_$(arg suffix_testname)" name="marker_quarternions_$(arg suffix_testname)" time-limit="$(arg TESTDURATION)" retry="5" />  
+  <test pkg="ar_track_alvar" type="test_ar.py" test-name="marker_quarternions_$(arg suffix_testname)" name="marker_quarternions_$(arg suffix_testname)" time-limit="$(arg TESTDURATION)" retry="10" />  
 </launch>