fix typehints in install tests

note that `with_args` is used as a workaround for a pytest type-hint
bug that declares the function passed to a marker as returned by
the marker, which is not true with a lambda.

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

tests/install/conftest.py

@@ -1,5 +1,6 @@
 import logging
 import os
+from typing import Sequence
 import pytest
 import pytest_dependency        # type: ignore
 import tempfile
@@ -322,6 +323,7 @@ def xcpng_chained(request):
     marker = request.node.get_closest_marker("continuation_of")
     assert marker is not None, "xcpng_chained fixture requires 'continuation_of' marker"
     continuation_of = callable_marker(marker.args[0], request)
+    assert isinstance(continuation_of, Sequence)
 
     vm_defs = [dict(name=vm_spec['vm'],
                     image_test=vm_spec['image_test'],

tests/install/test.py

@@ -78,7 +78,7 @@ class TestNested:
             cd_vbd=dict(device="xvdd", userdevice="3"),
             vifs=[dict(index=0, network_name=NETWORKS["MGMT"])],
         ))
-    @pytest.mark.answerfile(
+    @pytest.mark.answerfile.with_args(
         lambda system_disks_names, local_sr, package_source, iso_version: AnswerFile("INSTALL")
         .top_setattr({} if local_sr == "nosr" else {"sr-type": local_sr})
         .top_append(
@@ -111,7 +111,7 @@ def test_install(self, vm_booted_with_installer, system_disks_names,
         "xs70",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.continuation_of(
+    @pytest.mark.continuation_of.with_args(
         lambda version, firmware, local_sr, package_source: [dict(
             vm="vm1",
             image_test=f"TestNested::test_install[{firmware}-{version}-{package_source}-{local_sr}]")])
@@ -245,6 +245,7 @@ def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=Fal
                 raise AssertionError(f"Unhandled LSB release {lsb_rel!r}")
             # check for firstboot issues
             # FIXME: flaky, must check logs extraction on failure
+            stamp = ''
             try:
                 for stamp in sorted(STAMPS):
                     wait_for(lambda: pool.master.ssh(["test", "-e", f"{STAMPS_DIR}/{stamp}"],
@@ -302,7 +303,7 @@ def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=Fal
         "xs70",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.continuation_of(
+    @pytest.mark.continuation_of.with_args(
         lambda firmware, version, machine, local_sr, package_source: [
             dict(vm="vm1",
                  image_test=("TestNested::test_tune_firstboot"
@@ -329,11 +330,11 @@ def test_boot_inst(self, create_vms,
         ("821.1", "821.1"),
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.continuation_of(
+    @pytest.mark.continuation_of.with_args(
         lambda firmware, orig_version, machine, package_source, local_sr: [dict(
             vm="vm1",
             image_test=f"TestNested::test_boot_inst[{firmware}-{orig_version}-{machine}-{package_source}-{local_sr}]")])
-    @pytest.mark.answerfile(
+    @pytest.mark.answerfile.with_args(
         lambda system_disks_names, package_source, iso_version: AnswerFile("UPGRADE").top_append(
             {"iso": {"TAG": "source", "type": "local"},
              "net": {"TAG": "source", "type": "url",
@@ -365,7 +366,7 @@ def test_upgrade(self, vm_booted_with_installer, system_disks_names,
         "821.1-821.1",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.continuation_of(
+    @pytest.mark.continuation_of.with_args(
         lambda firmware, mode, machine, package_source, local_sr: [dict(
             vm="vm1",
             image_test=(f"TestNested::test_upgrade[{firmware}-{mode}-{machine}-{package_source}-{local_sr}]"))])
@@ -390,7 +391,7 @@ def test_boot_upg(self, create_vms,
         ("821.1-821.1", "821.1"),
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.continuation_of(
+    @pytest.mark.continuation_of.with_args(
         lambda firmware, orig_version, local_sr, package_source: [dict(
             vm="vm1",
             image_test=f"TestNested::test_boot_upg[{firmware}-{orig_version}-host1-{package_source}-{local_sr}]")])
@@ -421,7 +422,7 @@ def test_restore(self, vm_booted_with_installer, system_disks_names,
         "821.1-821.1-821.1",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.continuation_of(
+    @pytest.mark.continuation_of.with_args(
         lambda firmware, mode, package_source, local_sr: [dict(
             vm="vm1",
             image_test=(f"TestNested::test_restore[{firmware}-{mode}-{package_source}-{local_sr}]"))])

tests/install/test_fixtures.py

@@ -5,7 +5,7 @@
 
 # test the answerfile fixture can run on 2 parametrized instances
 # of the test in one run
-@pytest.mark.answerfile(lambda: AnswerFile("INSTALL").top_append(
+@pytest.mark.answerfile.with_args(lambda: AnswerFile("INSTALL").top_append(
     {"TAG": "source", "type": "local"},
     {"TAG": "primary-disk", "CONTENTS": "nvme0n1"},
 ))