From 3b69361a00202851025a427a79d189f1c8e8fb12 Mon Sep 17 00:00:00 2001 From: Anthony Lamping Date: Tue, 27 Feb 2018 23:01:30 -0500 Subject: [PATCH] CI: move missions into a folder --- integrationtests/python_src/px4_it/mavros/mission_test.py | 2 +- .../python_src/px4_it/mavros/{ => missions}/multirotor_box.plan | 0 .../python_src/px4_it/mavros/{ => missions}/vtol_new_1.plan | 0 .../python_src/px4_it/mavros/{ => missions}/vtol_new_2.plan | 0 .../python_src/px4_it/mavros/{ => missions}/vtol_old_1.plan | 0 .../python_src/px4_it/mavros/{ => missions}/vtol_old_2.plan | 0 .../python_src/px4_it/mavros/{ => missions}/vtol_old_3.plan | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename integrationtests/python_src/px4_it/mavros/{ => missions}/multirotor_box.plan (100%) rename integrationtests/python_src/px4_it/mavros/{ => missions}/vtol_new_1.plan (100%) rename integrationtests/python_src/px4_it/mavros/{ => missions}/vtol_new_2.plan (100%) rename integrationtests/python_src/px4_it/mavros/{ => missions}/vtol_old_1.plan (100%) rename integrationtests/python_src/px4_it/mavros/{ => missions}/vtol_old_2.plan (100%) rename integrationtests/python_src/px4_it/mavros/{ => missions}/vtol_old_3.plan (100%) diff --git a/integrationtests/python_src/px4_it/mavros/mission_test.py b/integrationtests/python_src/px4_it/mavros/mission_test.py index 6cc9239b5e..a3d33fd85f 100755 --- a/integrationtests/python_src/px4_it/mavros/mission_test.py +++ b/integrationtests/python_src/px4_it/mavros/mission_test.py @@ -236,7 +236,7 @@ class MavrosMissionTest(MavrosTestCommon): self.mission_name = sys.argv[1] mission_file = os.path.dirname( - os.path.realpath(__file__)) + "/" + sys.argv[1] + os.path.realpath(__file__)) + "/missions/" + sys.argv[1] rospy.loginfo("reading mission {0}".format(mission_file)) try: diff --git a/integrationtests/python_src/px4_it/mavros/multirotor_box.plan b/integrationtests/python_src/px4_it/mavros/missions/multirotor_box.plan similarity index 100% rename from integrationtests/python_src/px4_it/mavros/multirotor_box.plan rename to integrationtests/python_src/px4_it/mavros/missions/multirotor_box.plan diff --git a/integrationtests/python_src/px4_it/mavros/vtol_new_1.plan b/integrationtests/python_src/px4_it/mavros/missions/vtol_new_1.plan similarity index 100% rename from integrationtests/python_src/px4_it/mavros/vtol_new_1.plan rename to integrationtests/python_src/px4_it/mavros/missions/vtol_new_1.plan diff --git a/integrationtests/python_src/px4_it/mavros/vtol_new_2.plan b/integrationtests/python_src/px4_it/mavros/missions/vtol_new_2.plan similarity index 100% rename from integrationtests/python_src/px4_it/mavros/vtol_new_2.plan rename to integrationtests/python_src/px4_it/mavros/missions/vtol_new_2.plan diff --git a/integrationtests/python_src/px4_it/mavros/vtol_old_1.plan b/integrationtests/python_src/px4_it/mavros/missions/vtol_old_1.plan similarity index 100% rename from integrationtests/python_src/px4_it/mavros/vtol_old_1.plan rename to integrationtests/python_src/px4_it/mavros/missions/vtol_old_1.plan diff --git a/integrationtests/python_src/px4_it/mavros/vtol_old_2.plan b/integrationtests/python_src/px4_it/mavros/missions/vtol_old_2.plan similarity index 100% rename from integrationtests/python_src/px4_it/mavros/vtol_old_2.plan rename to integrationtests/python_src/px4_it/mavros/missions/vtol_old_2.plan diff --git a/integrationtests/python_src/px4_it/mavros/vtol_old_3.plan b/integrationtests/python_src/px4_it/mavros/missions/vtol_old_3.plan similarity index 100% rename from integrationtests/python_src/px4_it/mavros/vtol_old_3.plan rename to integrationtests/python_src/px4_it/mavros/missions/vtol_old_3.plan