Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package virt-manager for openSUSE:Factory 
checked in at 2024-08-08 10:57:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
 and      /work/SRC/openSUSE:Factory/.virt-manager.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "virt-manager"

Thu Aug  8 10:57:14 2024 rev:261 rq:1192345 version:4.1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes        
2024-08-05 17:20:45.069835657 +0200
+++ /work/SRC/openSUSE:Factory/.virt-manager.new.7232/virt-manager.changes      
2024-08-08 10:57:33.433545333 +0200
@@ -1,0 +2,7 @@
+Tue Aug  6 10:13:04 MDT 2024 - carn...@suse.com
+
+- Fix test failure with libvirt version 10.6.0
+  092-cli-Use-regex-for-grep-and-nogrep-args.patch
+  093-cli-Fix-with-latest-libvirt.patch
+
+-------------------------------------------------------------------

New:
----
  092-cli-Use-regex-for-grep-and-nogrep-args.patch
  093-cli-Fix-with-latest-libvirt.patch

BETA DEBUG BEGIN:
  New:- Fix test failure with libvirt version 10.6.0
  092-cli-Use-regex-for-grep-and-nogrep-args.patch
  093-cli-Fix-with-latest-libvirt.patch
  New:  092-cli-Use-regex-for-grep-and-nogrep-args.patch
  093-cli-Fix-with-latest-libvirt.patch
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.9wRX9g/_old  2024-08-08 10:57:35.489629859 +0200
+++ /var/tmp/diff_new_pack.9wRX9g/_new  2024-08-08 10:57:35.489629859 +0200
@@ -129,6 +129,8 @@
 Patch89:        089-hostdev-Fix-error-when-mdev-type_id-is-missing.patch
 Patch90:        090-db1b2fbc-Use-GtkFileChooserNative.patch
 Patch91:        091-uitests-Fix-with-GtkFileChooserNative.patch
+Patch92:        092-cli-Use-regex-for-grep-and-nogrep-args.patch
+Patch93:        093-cli-Fix-with-latest-libvirt.patch
 Patch100:       
revert-363fca41-virt-install-Require-osinfo-for-non-x86-HVM-case-too.patch
 # SUSE Only
 Patch150:       virtman-desktop.patch
@@ -316,6 +318,7 @@
 donttest="$donttest or testCLI0195virt_install_xen_hvm"
 donttest="$donttest or testCLI0196virt_install_xen_hvm"
 donttest="$donttest or testCLI0203virt_install_bhyve_default_f27"
+#
 donttest="$donttest or testCLI0280virt_xml_build_disk_domain"
 donttest="$donttest or testCLI0287virt_xml_edit_cpu_host_copy"
 donttest="$donttest or testCLI0288virt_xml_build_pool_logical_disk"

++++++ 092-cli-Use-regex-for-grep-and-nogrep-args.patch ++++++
Subject: tests: cli: Use regex for grep= and nogrep= args
From: Cole Robinson crobi...@redhat.com Tue Aug 6 10:33:38 2024 -0400
Date: Wed Aug 7 11:58:49 2024 -0400:
Git: 0288e9258113f7db5b69c1eac00c2341a69875ff

This will let us match more complex output, and match error message
differences across libvirt versions

Signed-off-by: Cole Robinson <crobi...@redhat.com>

--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -6,6 +6,7 @@
 import atexit
 import io
 import os
+import re
 import shlex
 import shutil
 import sys
@@ -341,10 +342,10 @@ class Command(object):
             _raise_error("Expected command to %s, but it didn't.\n" %
                  (self.check_success and "pass" or "fail"))
 
-        if self.grep and self.grep not in output:
-            _raise_error("Didn't find grep=%s" % self.grep)
-        if self.nogrep and self.nogrep in output:
-            _raise_error("Found grep=%s when we shouldn't see it" %
+        if self.grep and not re.search(self.grep, output):
+            _raise_error("Didn't find regex grep=%s" % self.grep)
+        if self.nogrep and re.search(self.nogrep, output):
+            _raise_error("Found regex grep=%s when we shouldn't see it" %
                     self.nogrep)
 
         if self.compare_file:
@@ -949,7 +950,7 @@ c.add_invalid("--disk size=1 --file foob
 ################################################
 
 c = vinst.add_category("invalid-devices", "--noautoconsole --nodisks --pxe 
--osinfo require=no")
-c.add_invalid("--clock foo_tickpolicy=merge", grep="Unknown --clock options: 
['foo_tickpolicy']")  # Bad suboption
+c.add_invalid("--clock foo_tickpolicy=merge", grep="Unknown --clock 
options:.*'foo_tickpolicy'")  # Bad suboption
 c.add_invalid("--connect %(URI-TEST-FULL)s --host-device 1d6b:2", 
grep="corresponds to multiple node devices")
 c.add_invalid("--connect %(URI-TEST-FULL)s --host-device 
pci_8086_2850_scsi_host_scsi_host", grep="Unsupported node device type 
'scsi_host'")  # Unsupported hostdev type
 c.add_invalid("--host-device foobarhostdev", grep="Unknown hostdev address 
string format")  # Unknown hostdev

++++++ 093-cli-Fix-with-latest-libvirt.patch ++++++
Subject: tests: cli: Fix with latest libvirt
From: Cole Robinson crobi...@redhat.com Tue Aug 6 10:34:28 2024 -0400
Date: Wed Aug 7 11:58:49 2024 -0400:
Git: 1194f09968b4cfb637bec6f2361c31abc6d9ffb8

The libvirt test driver supports more APIs now, so we are getting
a different error message.

Extend the grep= string to work with both old and new libvirt

Signed-off-by: Cole Robinson <crobi...@redhat.com>

--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1337,7 +1337,7 @@ c.add_invalid("test --edit 2 --cpu host-
 c.add_invalid("test-for-virtxml --edit 5 --tpm /dev/tpm", grep="'--edit 5' 
requested but there's only 1 --tpm object in the XML")
 c.add_invalid("test-for-virtxml --add-device --host-device 0x04b3:0x4485 
--update --confirm", input_text="yes", grep="not supported")
 c.add_invalid("test-for-virtxml --remove-device --host-device 1 --update 
--confirm", input_text="foo\nyes\n", grep="not supported by the connection 
driver: virDomainDetachDevice")
-c.add_invalid("test-for-virtxml --edit --graphics password=foo,keymap= 
--update --confirm", input_text="yes", grep="not supported by the connection 
driver: virDomainUpdateDeviceFlags")
+c.add_invalid("test-for-virtxml --edit --graphics password=foo,keymap= 
--update --confirm", input_text="yes", grep="(not supported by the connection 
driver: virDomainUpdateDeviceFlags|persistent update of device 'graphics' is 
not supported)")
 c.add_invalid("--build-xml --memory 10,maxmemory=20", grep="--build-xml not 
supported for --memory")
 c.add_invalid("test-state-shutoff --edit sparse=no --disk path=blah", 
grep="Don't know how to match device type 'disk' property 'sparse'")
 c.add_invalid("test --add-device --xml ./@foo=bar", grep="--xml can only be 
used with --edit")

++++++ 
revert-363fca41-virt-install-Require-osinfo-for-non-x86-HVM-case-too.patch 
++++++
--- /var/tmp/diff_new_pack.9wRX9g/_old  2024-08-08 10:57:35.897646632 +0200
+++ /var/tmp/diff_new_pack.9wRX9g/_new  2024-08-08 10:57:35.901646796 +0200
@@ -29,7 +29,7 @@
  VIRTINSTALL_OSINFO_DISABLE_REQUIRE=1.
 --- a/tests/test_cli.py
 +++ b/tests/test_cli.py
-@@ -1181,7 +1181,6 @@ c.add_compare("--connect %(URI-KVM-ARMV7
+@@ -1182,7 +1182,6 @@ c.add_compare("--connect %(URI-KVM-ARMV7
  #################
  
  c.add_valid("--arch aarch64 --osinfo fedora19 --nodisks --pxe --connect " + 
utils.URIs.kvm_x86_nodomcaps, grep="Libvirt version does not support UEFI")  # 
attempt to default to aarch64 UEFI, but it fails, but should only print warnings

Reply via email to