Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: correct placement of not-alive-after-test message 

This was misplaced with bad conflict resolution
This commit is contained in:
Peter Barker 2021-06-23 15:06:02 +10:00 committed by Andrew Tridgell
parent e51631c8b0
commit 55e8922c3c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/common.py
View File

@ -5817,7 +5817,6 @@ Also, ignores heartbeats not from our target system'''
self.context_pop() self.context_pop()
except Exception as e: except Exception as e:
self.print_exception_caught(e, send_statustext=False) self.print_exception_caught(e, send_statustext=False)
self.progress("Not alive after test", send_statustext=False)
passed = False passed = False
ardupilot_alive = False ardupilot_alive = False
@ -5826,6 +5825,7 @@ Also, ignores heartbeats not from our target system'''
ardupilot_alive = True ardupilot_alive = True
except Exception: except Exception:
# process is dead # process is dead
self.progress("Not alive after test", send_statustext=False)
passed = False passed = False
reset_needed = True reset_needed = True