install: revert broken use of Defer fixture

This reverts part of 09c4d6e (Avoid
destroying/unloading the resources before entering the debugger).

The install tests are already ensuring that the VMs are not destroyed when
entering PDB, and delaying commands actively breaks the test (notably
calling vm.shutdown on a powered-off VM).

Signed-off-by: Yann Dirson <yann.dirson@vates.tech>

Author: ydirson

tests/install/conftest.py

@@ -11,7 +11,7 @@
 from data import ARP_SERVER, ISO_IMAGES, ISO_IMAGES_BASE, ISO_IMAGES_CACHE, TEST_SSH_PUBKEY, TOOLS
 from lib import installer, pxe
 from lib.commands import local_cmd
-from lib.common import Defer, callable_marker, url_download, wait_for
+from lib.common import callable_marker, url_download, wait_for
 from lib.installer import AnswerFile
 
 from typing import TYPE_CHECKING, Any, Generator, Sequence
@@ -273,8 +273,7 @@ def remastered_iso(installer_iso: dict[str, str | bool], answerfile: AnswerFile
         yield remastered_iso
 
 @pytest.fixture(scope='function')
-def vm_booted_with_installer(host: Host, create_vms: list[VM], remastered_iso: str, defer: Defer) \
-        -> Generator[VM, None, None]:
+def vm_booted_with_installer(host: Host, create_vms: list[VM], remastered_iso: str) -> Generator[VM, None, None]:
     host_vm, = create_vms # one single VM
     iso = remastered_iso
 
@@ -283,39 +282,52 @@ def vm_booted_with_installer(host: Host, create_vms: list[VM], remastered_iso: s
     assert mac_address is not None
     logging.info("Host VM has MAC %s", mac_address)
 
-    remote_iso = host.pool.push_iso(iso)
-    host_vm.insert_cd(os.path.basename(remote_iso))
-    defer(lambda: host.pool.remove_iso(remote_iso))
-
-    host_vm.start()
-    defer(lambda: host_vm.shutdown(force=True))
-    wait_for(host_vm.is_running, "Wait for host VM running")
-
-    # catch host-vm IP address
-    wait_for(lambda: pxe.arp_addresses_for(mac_address),
-             "Wait for DHCP server to see Host VM in ARP tables",
-             timeout_secs=10 * 60)
-    ips = pxe.arp_addresses_for(mac_address)
-    logging.info("Host VM has IPs %s", ips)
-    assert len(ips) == 1
-    host_vm.ip = ips[0]
-    ip = host_vm.ip
-    assert ip is not None
-
-    # host may not be up if ARP cache was filled
-    wait_for(lambda: local_cmd(["ping", "-c1", ip], check=False),
-             "Wait for host up", timeout_secs=10 * 60, retry_delay_secs=10)
-    wait_for(lambda: local_cmd(["nc", "-zw5", ip, "22"], check=False),
-             "Wait for ssh up on host", timeout_secs=10 * 60, retry_delay_secs=5)
-
-    yield host_vm
-
-    logging.info("Shutting down Host VM")
-    assert host_vm.ip is not None
-    installer.poweroff(host_vm.ip)
-    wait_for(host_vm.is_halted, "Wait for host VM halted")
-
-    host_vm.eject_cd()
+    remote_iso = None
+    try:
+        remote_iso = host.pool.push_iso(iso)
+        host_vm.insert_cd(os.path.basename(remote_iso))
+
+        try:
+            host_vm.start()
+            wait_for(host_vm.is_running, "Wait for host VM running")
+
+            # catch host-vm IP address
+            wait_for(lambda: pxe.arp_addresses_for(mac_address),
+                     "Wait for DHCP server to see Host VM in ARP tables",
+                     timeout_secs=10 * 60)
+            ips = pxe.arp_addresses_for(mac_address)
+            logging.info("Host VM has IPs %s", ips)
+            assert len(ips) == 1
+            host_vm.ip = ips[0]
+            ip = host_vm.ip
+            assert ip is not None
+
+            # host may not be up if ARP cache was filled
+            wait_for(lambda: local_cmd(["ping", "-c1", ip], check=False),
+                     "Wait for host up", timeout_secs=10 * 60, retry_delay_secs=10)
+            wait_for(lambda: local_cmd(["nc", "-zw5", ip, "22"], check=False),
+                     "Wait for ssh up on host", timeout_secs=10 * 60, retry_delay_secs=5)
+
+            yield host_vm
+
+            logging.info("Shutting down Host VM")
+            assert host_vm.ip is not None
+            installer.poweroff(host_vm.ip)
+            wait_for(host_vm.is_halted, "Wait for host VM halted")
+
+        except Exception as e:
+            logging.critical("caught exception %s", e)
+            host_vm.shutdown(force=True)
+            raise
+        except KeyboardInterrupt:
+            logging.warning("keyboard interrupt")
+            host_vm.shutdown(force=True)
+            raise
+
+        host_vm.eject_cd()
+    finally:
+        if remote_iso:
+            host.pool.remove_iso(remote_iso)
 
 @pytest.fixture(scope='function')
 def xcpng_chained(request: pytest.FixtureRequest) -> None: