From 2625168ab668f846f5ee67e1dfac492f5e401ca2 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 25 Oct 2023 14:10:41 +0500 Subject: [PATCH] virt-manager: fix tests --- srcpkgs/python3-gpg/template | 4 +- srcpkgs/virt-manager/patches/fix_tests.patch | 70 ++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/virt-manager/patches/fix_tests.patch diff --git a/srcpkgs/python3-gpg/template b/srcpkgs/python3-gpg/template index 617a546dd6455..1cab0aa3a989c 100644 --- a/srcpkgs/python3-gpg/template +++ b/srcpkgs/python3-gpg/template @@ -1,14 +1,16 @@ # Template file for 'python3-gpg' pkgname=python3-gpg version=1.10.0 -revision=11 +revision=12 build_style=python3-module hostmakedepends="swig gpgme-devel python3-setuptools" makedepends="libgpg-error-devel libassuan-devel python3-devel ${hostmakedepends}" depends="python3" +checkdepends="python3-gpg" short_desc="Python3 bindings for GPGME GnuPG cryptography library" license="LGPL-2.1-or-later, GPL-2.0-or-later" maintainer="Felix Van der Jeugt " homepage="https://www.gnupg.org" distfiles="${PYPI_SITE}/g/gpg/gpg-${version}.tar.gz" checksum=349214a866c84aa548bc35ed14eccd2ec9085b3958d5753a63a19a71a1f523ca +make_check=no # tests are not available diff --git a/srcpkgs/virt-manager/patches/fix_tests.patch b/srcpkgs/virt-manager/patches/fix_tests.patch new file mode 100644 index 0000000000000..f158de808519b --- /dev/null +++ b/srcpkgs/virt-manager/patches/fix_tests.patch @@ -0,0 +1,70 @@ +From 6e5c1db6b4a0af96afeb09a09fb2fc2b73308f01 Mon Sep 17 00:00:00 2001 +From: Laszlo Ersek +Date: Sun, 27 Aug 2023 09:19:09 +0200 +Subject: [PATCH] tests/data: refresh Fedora tree URLs in virt-install-osinfo* + expected XMLs + +Libosinfo seems to generate Fedora tree URLs using the "https", not +"http", scheme now; which breaks CI. Update the expected outputs +accordingly. + +Signed-off-by: Laszlo Ersek +--- + .../cli/compare/virt-install-osinfo-unattended-treeapis.xml | 2 +- + tests/data/cli/compare/virt-install-osinfo-url-unattended.xml | 2 +- + tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml | 2 +- + tests/data/cli/compare/virt-install-osinfo-url.xml | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml b/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml +index 1140bf0bb..5f3c3474e 100644 +--- a/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml ++++ b/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml +@@ -13,7 +13,7 @@ + hvm + /VIRTINST-TESTSUITE/vmlinuz + /VIRTINST-TESTSUITE/initrd.img +- ks=file:/fedora.ks method=http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/ ++ ks=file:/fedora.ks method=https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/ + + + +diff --git a/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml +index fe653b8b4..2388120ac 100644 +--- a/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml ++++ b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml +@@ -13,7 +13,7 @@ + hvm + /VIRTINST-TESTSUITE/vmlinuz + /VIRTINST-TESTSUITE/initrd.img +- ks=file:/fedora.ks inst.repo=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/ ++ ks=file:/fedora.ks inst.repo=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/ + + + +diff --git a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml +index 99fb90fb2..11fce0aad 100644 +--- a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml ++++ b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml +@@ -13,7 +13,7 @@ + hvm + /VIRTINST-TESTSUITE/vmlinuz + /VIRTINST-TESTSUITE/initrd.img +- method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/ ++ method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/ + + + +diff --git a/tests/data/cli/compare/virt-install-osinfo-url.xml b/tests/data/cli/compare/virt-install-osinfo-url.xml +index 37fcc1091..ea1937a30 100644 +--- a/tests/data/cli/compare/virt-install-osinfo-url.xml ++++ b/tests/data/cli/compare/virt-install-osinfo-url.xml +@@ -13,7 +13,7 @@ + hvm + /VIRTINST-TESTSUITE/vmlinuz + /VIRTINST-TESTSUITE/initrd.img +- method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/ ++ method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/ + + +