From fc1e2110391279c1e4f8ebd4f934caffe03fc628 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 15 Dec 2018 08:36:48 +1100 Subject: [PATCH] Tools: autotest: fix balancebot tests --- Tools/autotest/balancebot.py | 12 ------------ Tools/autotest/balancebot1.txt | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Tools/autotest/balancebot.py b/Tools/autotest/balancebot.py index cc9a3737ed..8ff8489fc7 100644 --- a/Tools/autotest/balancebot.py +++ b/Tools/autotest/balancebot.py @@ -69,17 +69,11 @@ class AutoTestBalanceBot(AutoTestRover): self.mavproxy.send('switch 6\n') # Manual mode self.wait_mode('MANUAL') - self.progress("Waiting reading for arm") - self.wait_ready_to_arm() - self.arm_vehicle() - self.run_test("Drive an RTL Mission", self.drive_rtl_mission) self.run_test("Drive Mission %s" % "balancebot1.txt", self.drive_mission_balancebot1) - self.run_test("Disarm Vehicle", self.disarm_vehicle) - self.run_test("Get Banner", self.do_get_banner) self.run_test("Get Capabilities", @@ -95,12 +89,6 @@ class AutoTestBalanceBot(AutoTestRover): self.log_download( self.buildlogs_path("APMrover2-log.bin"), upload_logs=len(self.fail_list)>0)) - # if not drive_left_circuit(self): - # self.progress("Failed left circuit") - # failed = True - # if not drive_RTL(self): - # self.progress("Failed RTL") - # failed = True except pexpect.TIMEOUT: self.progress("Failed with timeout") diff --git a/Tools/autotest/balancebot1.txt b/Tools/autotest/balancebot1.txt index bff75bb57a..138b97b1c0 100644 --- a/Tools/autotest/balancebot1.txt +++ b/Tools/autotest/balancebot1.txt @@ -1,19 +1,19 @@ QGC WPL 110 0 0 0 16 0.000000 0.000000 0.000000 0.000000 40.071289 -105.230057 11085.900391 1 -3 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071186 -105.230064 9502.200195 1 -4 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071083 -105.230026 11085.900391 1 -5 0 3 178 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1 -6 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071011 -105.230003 11085.900391 1 -7 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070999 -105.229919 11085.900391 1 -8 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070900 -105.229950 11085.900391 1 -9 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070843 -105.229858 11085.889648 1 -10 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070801 -105.229820 11085.849609 1 -11 0 3 178 0.000000 2.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1 -12 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070721 -105.229736 11085.900391 1 -13 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070827 -105.229530 11086.000000 1 -14 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070904 -105.229362 11085.929688 1 -15 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070995 -105.229118 12669.580078 1 -16 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071133 -105.229233 11085.900391 1 -17 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071255 -105.229355 11085.900391 1 -18 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071404 -105.229485 9502.200195 1 -19 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071369 -105.229828 9502.200195 1 +1 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071186 -105.230064 9502.200195 1 +2 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071083 -105.230026 11085.900391 1 +3 0 3 178 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1 +4 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071011 -105.230003 11085.900391 1 +5 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070999 -105.229919 11085.900391 1 +6 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070900 -105.229950 11085.900391 1 +7 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070843 -105.229858 11085.889648 1 +8 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070801 -105.229820 11085.849609 1 +9 0 3 178 0.000000 2.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1 +10 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070721 -105.229736 11085.900391 1 +11 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070827 -105.229530 11086.000000 1 +12 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070904 -105.229362 11085.929688 1 +13 0 3 16 0.000000 0.000000 0.000000 0.000000 40.070995 -105.229118 12669.580078 1 +14 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071133 -105.229233 11085.900391 1 +15 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071255 -105.229355 11085.900391 1 +16 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071404 -105.229485 9502.200195 1 +17 0 3 16 0.000000 0.000000 0.000000 0.000000 40.071369 -105.229828 9502.200195 1