Merge pull request autotest#4961 from iccaszhulili/itco_version

Skip the watchdog testing against libvirt-9.1.0 and before
vwu-vera · Jun 15, 2023 · 78c3c31 · 78c3c31
2 parents 06eff45 + 0e4fe75
commit 78c3c31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/libvirt/tests/cfg/virtual_device/watchdog.cfg b/libvirt/tests/cfg/virtual_device/watchdog.cfg
@@ -25,6 +25,7 @@
             model_test = "yes"
         - model_tco:
             model = "itco"
+            func_supported_since_libvirt_ver = (9, 1, 0)
             variants:
                 - model_test:
                     model_test = "yes"

diff --git a/libvirt/tests/src/virtual_device/watchdog.py b/libvirt/tests/src/virtual_device/watchdog.py
@@ -10,6 +10,7 @@
 from virttest import data_dir
 from virttest import virsh
 from virttest import utils_misc
+from virttest import libvirt_version
 from virttest.libvirt_xml import vm_xml
 from virttest.libvirt_xml.devices.watchdog import Watchdog
 from virttest.libvirt_xml.devices.controller import Controller
@@ -181,6 +182,8 @@ def _check_dump_file(dump_path, domain_id):
     hotunplug_test = params.get("hotunplug_test") == "yes"
     machine_type = params.get("machine_type")
 
+    libvirt_version.is_libvirt_feature_supported(params)
+
     if machine_type == "q35" and model == "ib700":
         test.cancel("ib700wdt watchdog device is not supported "
                     "on guest with q35 machine type")