WIP XVA names depend on test name

FIXME: should be folded into other commits?

Author: ydirson

tests/install/test_install.py

@@ -39,7 +39,7 @@ class TestInstallNested:
             "primary-disk": {"text": "nvme0n1"},
         })
     @pytest.mark.installer_iso("xcpng-8.2.1-2023")
-    def test_install_nested_821_uefi(self, iso_remaster, create_vms):
+    def test_install_nested_821_uefi(self, request, iso_remaster, create_vms):
         assert len(create_vms) == 1
         host_vm = create_vms[0]
         # FIXME should be part of vm def
@@ -117,22 +117,24 @@ def test_install_nested_821_uefi(self, iso_remaster, create_vms):
         # record this state
         # FIXME move to fixture
         # FIXME where to store?
-        host_vm.host.ssh(["rm -f test_install_nested_821_uefi-vm1.xva"])
-        host_vm.export("test_install_nested_821_uefi-vm1.xva", "zstd",
-                       use_cache=CACHE_IMPORTED_VM)
+        xva_name = request.node.nodeid + ".xva"
+        host_vm.host.ssh(["rm -f", xva_name])
+        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)
 
 
     @pytest.mark.parametrize("base", [
-        pytest.param("install", marks=pytest.mark.dependency(
-            depends=["TestInstallNested::test_install_nested_821_uefi"])),
-        pytest.param("upgrade", marks=pytest.mark.dependency(
-            depends=["TestInstallNested::test_upgrade_nested_821_uefi"])),
+        pytest.param("install", marks=[
+            pytest.mark.dependency(depends=["TestInstallNested::test_install_nested_821_uefi"]),
+            pytest.mark.vm_definitions(
+                dict(name="vm 1", image="tests/install/test_install.py::TestInstallNested::test_install_nested_821_uefi.xva")),
+        ]),
+        pytest.param("upgrade", marks=[
+            pytest.mark.dependency(depends=["TestInstallNested::test_upgrade_nested_821_uefi"]),
+            pytest.mark.vm_definitions(
+                dict(name="vm 1", image="tests/install/test_install.py::TestInstallNested::test_upgrade_nested_821_uefi.xva")),
+        ]),
     ])
-    @pytest.mark.vm_definitions(
-        dict(name="vm 1",
-             image="test_install_nested_821_uefi-vm1.xva"
-             ))
-    def test_firstboot_nested_821_uefi(self, create_vms, base):
+    def test_firstboot_nested_821_uefi(self, request, create_vms, base):
         host_vm = create_vms[0]
         vif = host_vm.vifs()[0]
         mac_address = vif.param_get('MAC')
@@ -227,14 +229,14 @@ def test_firstboot_nested_821_uefi(self, create_vms, base):
         # record this state
         # FIXME move to fixture
         # FIXME where to store?
-        host_vm.host.ssh(["rm -f test_firstboot_nested_821_uefi-vm1.xva"])
-        host_vm.export("test_firstboot_nested_821_uefi-vm1.xva", "zstd",
-                       use_cache=CACHE_IMPORTED_VM)
+        xva_name = request.node.nodeid + ".xva"
+        host_vm.host.ssh(["rm -f", xva_name])
+        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)
 
     @pytest.mark.dependency(depends=["TestInstallNested::test_firstboot_nested_821_uefi[install]"])
     @pytest.mark.vm_definitions(
         dict(name="vm 1",
-             image="test_firstboot_nested_821_uefi-vm1.xva"
+             image="tests/install/test_install.py::TestInstallNested::test_firstboot_nested_821_uefi[install].xva"
              ))
     @pytest.mark.answerfile(
         {
@@ -243,7 +245,7 @@ def test_firstboot_nested_821_uefi(self, create_vms, base):
             "existing-installation": {"text": "nvme0n1"},
         })
     @pytest.mark.installer_iso("xcpng-8.2.1-2023")
-    def test_upgrade_nested_821_uefi(self, iso_remaster, create_vms):
+    def test_upgrade_nested_821_uefi(self, request, iso_remaster, create_vms):
         host_vm = create_vms[0]
         vif = host_vm.vifs()[0]
         mac_address = vif.param_get('MAC')
@@ -323,6 +325,6 @@ def test_upgrade_nested_821_uefi(self, iso_remaster, create_vms):
         # record this state
         # FIXME move to fixture
         # FIXME where to store?
-        host_vm.host.ssh(["rm -f test_upgrade_nested_821_uefi-vm1.xva"])
-        host_vm.export("test_upgrade_nested_821_uefi-vm1.xva", "zstd",
-                       use_cache=CACHE_IMPORTED_VM)
+        xva_name = request.node.nodeid + ".xva"
+        host_vm.host.ssh(["rm -f", xva_name])
+        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)