Make tests in jsk_perception stable

jsk-ros-pkg · Jun 18, 2016 · 3d987b9 · 3d987b9
1 parent 50ef470
commit 3d987b9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ env:
     - ROS_DISTRO=jade   USE_DEB=false
 matrix:
   allow_failures:
-    - env: ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
+    - env: ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
 script:
   - source .travis/travis.sh
   - (cd doc && source setup.sh && make html)
diff --git a/jsk_perception/test/label_image_decomposer.test b/jsk_perception/test/label_image_decomposer.test
@@ -4,15 +4,23 @@
     <arg name="gui" value="false" />
   </include>
 
-  <test test-name="test_label_image_decomposer"
-        name="test_label_image_decomposer"
+  <test test-name="test_label_image_decomposer_output"
+        name="test_label_image_decomposer_output"
         pkg="jsk_tools" type="test_topic_published.py"
         retry="3">
     <rosparam>
       topic_0: /label_image_decomposer/output
-      timeout_0: 30
+      timeout_0: 50
+    </rosparam>
+  </test>
+
+  <test test-name="test_label_image_decomposer_label_viz"
+        name="test_label_image_decomposer_label_viz"
+        pkg="jsk_tools" type="test_topic_published.py"
+        retry="3">
+    <rosparam>
       topic_1: /label_image_decomposer/output/label_viz
-      timeout_1: 30
+      timeout_1: 50
     </rosparam>
   </test>
 

diff --git a/jsk_perception/test/sklearn_classifier.test b/jsk_perception/test/sklearn_classifier.test
@@ -10,7 +10,7 @@
         retry="3">
     <rosparam>
       topic_0: /sklearn_classifier/output
-      timeout_0: 30
+      timeout_0: 50
     </rosparam>
   </test>