Small update of the test recovery, so the error in the recovery will not replace original test error message

Author: hholoubk

libvirt/tests/src/migration/migrate_vm.py

@@ -2434,14 +2434,14 @@ def get_target_hugepage_num(params):
 
             try:
                 remote_virsh_session = virsh.VirshPersistent(**remote_virsh_dargs)
-                logging.debug("Check if remote guest exists")
+                logging.debug("TEST_STEP: Check if remote guest exists")
                 if remote_virsh_session.domain_exists(target_vm_name) is False:
                     test.cancel("The guest '%s' on remote '%s' should be "
                                 "installed before the test."
                                 % (target_vm_name, server_ip))
                 # Check the prepared guest state on remote host.
                 # 'shut off' is expected.
-                logging.debug("Check if remote guest is in shutoff")
+                logging.debug(f"TEST_STEP: Check if remote guest is not alive")
                 if remote_virsh_session.is_alive(target_vm_name):
                     test.error("The guest '%s' on remote "
                                "'%s' should not be alive."
@@ -2735,7 +2735,7 @@ def get_target_hugepage_num(params):
                           % (cmd, output))
 
     finally:
-        logging.info("Recovery test environment")
+        logging.info("TEST_RECOVERY: Recovery test environment")
 
         logging.debug("Removing vm on remote if it exists.")
         virsh.remove_domain(vm.name, options='--nvram', uri=uri)
@@ -2863,10 +2863,10 @@ def get_target_hugepage_num(params):
                                                 cleanup=True,
                                                 ports=uri_port[1:])
                 remote_virsh_session = virsh.VirshPersistent(**remote_virsh_dargs)
-                logging.debug("Destroy remote guest")
-                remote_virsh_session.destroy(target_vm_name)
-                logging.debug("Recover remote guest xml")
-                remote_virsh_session.define(xml_path)
+                logging.debug("TEST_RECOVERY: Destroy remote guest")
+                remote_virsh_session.destroy(target_vm_name, ignore_status=True)
+                logging.debug("TEST_RECOVERY: Recover remote guest xml")
+                remote_virsh_session.define(xml_path, ignore_status=True)
             except (process.CmdError, remote.SCPError) as detail:
                 test.error(detail)
             finally: