From 55e8922c3cd740b48b109baf4576f0173cb3fc74 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Wed, 23 Jun 2021 15:06:02 +1000
Subject: [PATCH] autotest: correct placement of not-alive-after-test message

This was misplaced with bad conflict resolution
---
 Tools/autotest/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index e710eb665f..43abeac834 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -5817,7 +5817,6 @@ Also, ignores heartbeats not from our target system'''
             self.context_pop()
         except Exception as e:
             self.print_exception_caught(e, send_statustext=False)
-            self.progress("Not alive after test", send_statustext=False)
             passed = False
 
         ardupilot_alive = False
@@ -5826,6 +5825,7 @@ Also, ignores heartbeats not from our target system'''
             ardupilot_alive = True
         except Exception:
             # process is dead
+            self.progress("Not alive after test", send_statustext=False)
             passed = False
             reset_needed = True