From: Luciogi <Luciogi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] virt-manager: fix tests
Date: Wed, 25 Oct 2023 13:25:01 +0200 [thread overview]
Message-ID: <20231025112501.uoa3oF6bv_fM6hEZD6SnMZvUMk15eibBNBm-3IVpH-8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46885@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages virt-manager
https://github.com/void-linux/void-packages/pull/46885
virt-manager: fix tests
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glib)
A patch file from https://github.com/void-linux/void-packages/pull/46885.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virt-manager-46885.patch --]
[-- Type: text/x-diff, Size: 5520 bytes --]
From 2625168ab668f846f5ee67e1dfac492f5e401ca2 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
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 <felix.vanderjeugt@gmail.com>"
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 <lersek@redhat.com>
+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 <lersek@redhat.com>
+---
+ .../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 @@
+ <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>ks=file:/fedora.ks method=http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
++ <cmdline>ks=file:/fedora.ks method=https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+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 @@
+ <type arch="x86_64" machine="q35">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>ks=file:/fedora.ks inst.repo=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++ <cmdline>ks=file:/fedora.ks inst.repo=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+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 @@
+ <type arch="x86_64" machine="q35">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++ <cmdline>method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+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 @@
+ <type arch="x86_64" machine="q35">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++ <cmdline>method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
next prev parent reply other threads:[~2023-10-25 11:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 9:12 [PR PATCH] " Luciogi
2023-10-25 11:02 ` [PR REVIEW] " ahesford
2023-10-25 11:25 ` Luciogi [this message]
2023-10-25 11:29 ` [PR PATCH] [Updated] " Luciogi
2023-10-25 11:40 ` [PR REVIEW] " Luciogi
2024-01-25 1:48 ` github-actions
2024-02-09 1:44 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231025112501.uoa3oF6bv_fM6hEZD6SnMZvUMk15eibBNBm-3IVpH-8@z \
--to=luciogi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).