From 171a65c1cb98325608b28d8902fda5ea3435dcc1 Mon Sep 17 00:00:00 2001
From: Anthony Lamping <lamping.ap@gmail.com>
Date: Sat, 31 Mar 2018 08:24:09 -0400
Subject: [PATCH] CI: on mavros failure restart it instead of killing test

---
 test/mavros_posix_test_mission.test          | 1 +
 test/mavros_posix_tests_iris_opt_flow.test   | 1 +
 test/mavros_posix_tests_missions.test        | 1 +
 test/mavros_posix_tests_offboard_attctl.test | 1 +
 test/mavros_posix_tests_offboard_posctl.test | 1 +
 5 files changed, 5 insertions(+)

diff --git a/test/mavros_posix_test_mission.test b/test/mavros_posix_test_mission.test
index 10c85364e4..c070389a04 100644
--- a/test/mavros_posix_test_mission.test
+++ b/test/mavros_posix_test_mission.test
@@ -13,6 +13,7 @@
         <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="est" value="$(arg est)"/>
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
+        <arg name="respawn_mavros" value="true"/>
     </include>
     <!-- ROStest -->
     <test test-name="$(arg mission)" pkg="px4" type="mission_test.py" time-limit="300.0" args="$(arg mission).plan"/>
diff --git a/test/mavros_posix_tests_iris_opt_flow.test b/test/mavros_posix_tests_iris_opt_flow.test
index fccd7e52f7..7df79263b5 100644
--- a/test/mavros_posix_tests_iris_opt_flow.test
+++ b/test/mavros_posix_tests_iris_opt_flow.test
@@ -11,6 +11,7 @@
         <arg name="vehicle" value="iris_opt_flow"/>
         <arg name="est" value="$(arg est)"/>
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
+        <arg name="respawn_mavros" value="true"/>
     </include>
     <!-- ROStest -->
     <test test-name="mavros_flow_offboard_posctl_test" pkg="px4" type="mavros_offboard_posctl_test.py" time-limit="300.0"/>
diff --git a/test/mavros_posix_tests_missions.test b/test/mavros_posix_tests_missions.test
index a1c0a7e735..115beed4e3 100644
--- a/test/mavros_posix_tests_missions.test
+++ b/test/mavros_posix_tests_missions.test
@@ -11,6 +11,7 @@
         <arg name="vehicle" value="standard_vtol"/>
         <arg name="est" value="$(arg est)"/>
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
+        <arg name="respawn_mavros" value="true"/>
     </include>
     <!-- ROStest -->
     <test test-name="multicopter_box" pkg="px4" type="mission_test.py" time-limit="300.0" args="multirotor_box.plan"/>
diff --git a/test/mavros_posix_tests_offboard_attctl.test b/test/mavros_posix_tests_offboard_attctl.test
index c482f4e996..e1148b6f2e 100644
--- a/test/mavros_posix_tests_offboard_attctl.test
+++ b/test/mavros_posix_tests_offboard_attctl.test
@@ -11,6 +11,7 @@
         <arg name="vehicle" value="iris"/>
         <arg name="est" value="$(arg est)"/>
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
+        <arg name="respawn_mavros" value="true"/>
     </include>
     <!-- ROStest -->
     <test test-name="mavros_offboard_attctl_test" pkg="px4" type="mavros_offboard_attctl_test.py" time-limit="300.0"/>
diff --git a/test/mavros_posix_tests_offboard_posctl.test b/test/mavros_posix_tests_offboard_posctl.test
index bb1f622dae..ed88054344 100644
--- a/test/mavros_posix_tests_offboard_posctl.test
+++ b/test/mavros_posix_tests_offboard_posctl.test
@@ -11,6 +11,7 @@
         <arg name="vehicle" value="iris"/>
         <arg name="est" value="$(arg est)"/>
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
+        <arg name="respawn_mavros" value="true"/>
     </include>
     <!-- ROStest -->
     <test test-name="mavros_offboard_posctl_test" pkg="px4" type="mavros_offboard_posctl_test.py" time-limit="300.0"/>