Merge pull request #533 from xcp-ng/pcoval/review/master

zfsvol: Mark test_xva_export_import as xfail until properly fixed

Related-to: XCPNG-3297

Author: rzr

conftest.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+import argparse
 import itertools
 import logging
 import os
@@ -50,6 +51,15 @@
     CACHE_IMPORTED_VM = False
 assert CACHE_IMPORTED_VM in [True, False]
 
+class SplitCommaAction(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        items = getattr(namespace, self.dest, None)
+        if items is None:
+            items = []
+        if isinstance(values, str):
+            items.extend([v.strip() for v in values.split(",") if v.strip()])
+        setattr(namespace, self.dest, items)
+
 # pytest hooks
 
 def pytest_addoption(parser: pytest.Parser) -> None:
@@ -99,7 +109,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     )
     parser.addoption(
         "--image-format",
-        action="append",
+        action=SplitCommaAction,
         default=[],
         help="Format of VDI to execute tests on."
         "Example: vhd,qcow2"

tests/storage/zfsvol/test_zfsvol_sr.py

@@ -93,6 +93,7 @@ def test_invalid_vdi_size(self, zfsvol_sr: SR, image_format: ImageFormat):
             zfsvol_sr.create_vdi(virtual_size=MAX_VDI_SIZE[image_format] + 1)
         assert 'VDI Invalid size' in excinfo.value.stdout
 
+    @pytest.mark.xfail # Failing on Exception "Only snapshots can be cloned!"
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
     def test_xva_export_import(self, vm_on_zfsvol_sr: VM, compression: XVACompression, temp_large_dir: str,