[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/sid] d/patches: add fix from upstream for FTBFS with libvirt 10.0

[Pino Toscano (@pino)]

Pino Toscano pushed to branch debian/sid at Libvirt Packaging Team / virt-manager


Commits:
a8db17eb by Fabio Fantoni at 2024-03-08T14:33:22+01:00
d/patches: add fix from upstream for FTBFS with libvirt 10.0

- tests: cli: Adjust hotplug test for latest libvirt

Closes: #1064672

- - - - -


2 changed files:

- debian/patches/series
- + debian/patches/upstream_tests-cli-Adjust-hotplug-test-for-latest-libvirt.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 upstream_tests-data-refresh-Fedora-tree-URLs-in-virt-install-.patch
+upstream_tests-cli-Adjust-hotplug-test-for-latest-libvirt.patch


=====================================
debian/patches/upstream_tests-cli-Adjust-hotplug-test-for-latest-libvirt.patch
=====================================
@@ -0,0 +1,28 @@
+From 83fcc5b2e8f2cede84564387756fe8971de72188 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 22 Jan 2024 17:10:41 -0500
+Subject: [PATCH] tests: cli: Adjust hotplug test for latest libvirt
+
+The libvirt test driver now has implementations for hotplug routines,
+which broke string matching for one case.
+
+Loosen it up to work for old and new libvirt versions.
+
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ tests/test_cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 8274c788f..b2f707b9a 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -1341,7 +1341,7 @@ def add_compare(self, cat, args, compbase, **kwargs):
+ c.add_invalid("test --edit", grep="No change specified.")
+ c.add_invalid("test --edit 2 --cpu host-passthrough", grep="'--edit 2' requested but there's only 1 --cpu object in the XML")
+ 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 by the connection driver: virDomainAttachDevice")
++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("--build-xml --memory 10,maxmemory=20", grep="--build-xml not supported for --memory")



View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/commit/a8db17eb476ceab2fe5a0782227539cddd77d070

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/commit/a8db17eb476ceab2fe5a0782227539cddd77d070
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20240322/89c8415b/attachment-0001.htm>