From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
Date: Sat, 18 Nov 2023 01:16:14 +0000 (UTC) [thread overview]
Message-ID: <1700207835.1525b51fb1df477f8801470509e786558ab153dc.zmedico@gentoo> (raw)
commit: 1525b51fb1df477f8801470509e786558ab153dc
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 07:47:07 2023 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 07:57:15 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1525b51f
Add test case to reproduce bug 917259
Test bug 917259, where app-alternatives/gzip is upgraded
before its pigz RDEPEND is installed. This is triggered
when find_smallest_cycle selects a large cycle and the
topological sort produces poor results when leaf_nodes returns
app-alternatives/gzip as part of a large group of nodes.
This problem might be solved by implementing a finer-grained
ignore_priority for leaf_nodes calls.
Bug: https://bugs.gentoo.org/917259
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/tests/resolver/meson.build | 1 +
.../tests/resolver/test_alternatives_gzip.py | 248 +++++++++++++++++++++
2 files changed, 249 insertions(+)
diff --git a/lib/portage/tests/resolver/meson.build b/lib/portage/tests/resolver/meson.build
index 0d8c2921e1..7d2bd367d4 100644
--- a/lib/portage/tests/resolver/meson.build
+++ b/lib/portage/tests/resolver/meson.build
@@ -1,6 +1,7 @@
py.install_sources(
[
'ResolverPlayground.py',
+ 'test_alternatives_gzip.py',
'test_aggressive_backtrack_downgrade.py',
'test_autounmask.py',
'test_autounmask_binpkg_use.py',
diff --git a/lib/portage/tests/resolver/test_alternatives_gzip.py b/lib/portage/tests/resolver/test_alternatives_gzip.py
new file mode 100644
index 0000000000..602ed1756f
--- /dev/null
+++ b/lib/portage/tests/resolver/test_alternatives_gzip.py
@@ -0,0 +1,248 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import pytest
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (
+ ResolverPlayground,
+ ResolverPlaygroundTestCase,
+)
+
+
+@pytest.mark.xfail()
+class AlternativesGzipTestCase(TestCase):
+ def testAlternativesGzip(self):
+ """
+ Test bug 917259, where app-alternatives/gzip is upgraded before
+ its pigz RDEPEND is installed. This is triggered when
+ find_smallest_cycle selects a large cycle and the topological
+ sort produces poor results when leaf_nodes returns
+ app-alternatives/gzip as part of a large group of nodes.
+ This problem might be solved by implementing a finer-grained
+ ignore_priority for leaf_nodes calls.
+ """
+ ebuilds = {
+ "app-alternatives/gzip-1": {
+ "EAPI": "8",
+ "RDEPEND": "reference? ( >=app-arch/gzip-1.12-r3 ) pigz? ( >=app-arch/pigz-2.8[-symlink(-)] )",
+ "IUSE": "reference pigz",
+ "REQUIRED_USE": "^^ ( reference pigz )",
+ },
+ "app-alternatives/gzip-0": {
+ "EAPI": "8",
+ "RDEPEND": "reference? ( >=app-arch/gzip-1.12-r3 ) pigz? ( app-arch/pigz[-symlink(-)] )",
+ "IUSE": "reference pigz",
+ "REQUIRED_USE": "^^ ( reference pigz )",
+ },
+ "app-arch/gzip-1.13": {
+ "EAPI": "8",
+ "RDEPEND": "!app-arch/pigz[symlink(-)]",
+ "PDEPEND": "app-alternatives/gzip",
+ },
+ "app-arch/zstd-1.5.5": {
+ "EAPI": "8",
+ "DEPEND": ">=sys-libs/zlib-1.2.3",
+ "RDEPEND": ">=sys-libs/zlib-1.2.3",
+ },
+ "app-arch/pigz-2.8": {
+ "EAPI": "8",
+ "DEPEND": ">=sys-libs/zlib-1.2.3",
+ "RDEPEND": ">=sys-libs/zlib-1.2.3",
+ "PDEPEND": "app-alternatives/gzip",
+ },
+ "dev-lang/perl-5.36.1-r3": {
+ "EAPI": "8",
+ "BDEPEND": ">=sys-libs/zlib-1.2.12 virtual/libcrypt:=",
+ "RDEPEND": ">=sys-libs/zlib-1.2.12 virtual/libcrypt:=",
+ "DEPEND": ">=sys-libs/zlib-1.2.12 virtual/libcrypt:=",
+ },
+ "dev-libs/libgcrypt-1.10.2": {
+ "EAPI": "8",
+ "SLOT": "0",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ "DEPEND": "sys-libs/glibc",
+ "RDEPEND": "sys-libs/glibc",
+ },
+ "dev-libs/libpcre2-10.42-r1": {
+ "EAPI": "8",
+ "SLOT": "0/3",
+ "DEPEND": "sys-libs/zlib",
+ "RDEPEND": "sys-libs/zlib",
+ },
+ "sys-apps/locale-gen-2.23-r1": {
+ "EAPI": "8",
+ "RDEPEND": "app-alternatives/gzip",
+ },
+ "sys-apps/systemd-253.6": {
+ "EAPI": "8",
+ "SLOT": "0/2",
+ "BDEPEND": "dev-lang/perl",
+ "DEPEND": ">=sys-apps/util-linux-2.30:= >=dev-libs/libgcrypt-1.4.5:0= virtual/libcrypt:= dev-libs/libpcre2",
+ "RDEPEND": ">=sys-apps/util-linux-2.30:= >=dev-libs/libgcrypt-1.4.5:0= virtual/libcrypt:= dev-libs/libpcre2",
+ },
+ "sys-apps/util-linux-2.38.1-r2": {
+ "EAPI": "8",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ "DEPEND": "virtual/libcrypt:= sys-libs/zlib:= virtual/libudev:= dev-libs/libpcre2:=",
+ "RDEPEND": "sys-apps/systemd sys-libs/zlib:= virtual/libudev:= dev-libs/libpcre2:=",
+ },
+ "sys-devel/automake-1.16.5-r1": {
+ "EAPI": "8",
+ "BDEPEND": "app-alternatives/gzip",
+ "RDEPEND": ">=dev-lang/perl-5.6",
+ },
+ "sys-libs/glibc-2.37-r7": {
+ "EAPI": "8",
+ "BDEPEND": "sys-apps/locale-gen",
+ "IDEPEND": "sys-apps/locale-gen",
+ "RDEPEND": "dev-lang/perl",
+ },
+ "sys-libs/libxcrypt-4.4.36": {
+ "BDEPEND": "dev-lang/perl",
+ "DEPEND": "sys-libs/glibc",
+ "RDEPEND": "sys-libs/glibc",
+ },
+ "sys-libs/zlib-1.3-r1": {
+ "EAPI": "8",
+ "SLOT": "0/1",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ },
+ "sys-libs/zlib-1.2.13-r2": {
+ "EAPI": "8",
+ "SLOT": "0/1",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ },
+ "virtual/libcrypt-2-r1": {
+ "EAPI": "8",
+ "SLOT": "0/2",
+ "RDEPEND": "sys-libs/libxcrypt",
+ },
+ "virtual/libudev-251-r2": {
+ "EAPI": "8",
+ "SLOT": "0/1",
+ "RDEPEND": ">=sys-apps/systemd-251:0/2",
+ },
+ }
+
+ installed = {
+ "app-alternatives/gzip-0": {
+ "EAPI": "8",
+ "RDEPEND": "reference? ( >=app-arch/gzip-1.12-r3 ) pigz? ( app-arch/pigz[-symlink(-)] )",
+ "IUSE": "reference pigz",
+ "USE": "reference",
+ },
+ "app-arch/gzip-1.13": {
+ "EAPI": "8",
+ "RDEPEND": "!app-arch/pigz[symlink(-)]",
+ "PDEPEND": "app-alternatives/gzip",
+ },
+ "app-arch/zstd-1.5.5": {
+ "EAPI": "8",
+ "DEPEND": ">=sys-libs/zlib-1.2.3",
+ "RDEPEND": ">=sys-libs/zlib-1.2.3",
+ },
+ "dev-lang/perl-5.36.1-r3": {
+ "EAPI": "8",
+ "BDEPEND": ">=sys-libs/zlib-1.2.12 virtual/libcrypt:0/2=",
+ "RDEPEND": ">=sys-libs/zlib-1.2.12 virtual/libcrypt:0/2=",
+ "DEPEND": ">=sys-libs/zlib-1.2.12 virtual/libcrypt:0/2=",
+ },
+ "dev-libs/libgcrypt-1.10.2": {
+ "EAPI": "8",
+ "SLOT": "0",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ "DEPEND": "sys-libs/glibc",
+ "RDEPEND": "sys-libs/glibc",
+ },
+ "dev-libs/libpcre2-10.42-r1": {
+ "EAPI": "8",
+ "SLOT": "0/3",
+ "DEPEND": "sys-libs/zlib",
+ "RDEPEND": "sys-libs/zlib",
+ },
+ "sys-apps/locale-gen-2.23-r1": {
+ "EAPI": "8",
+ "RDEPEND": "app-alternatives/gzip",
+ },
+ "sys-apps/systemd-253.6": {
+ "EAPI": "8",
+ "SLOT": "0/2",
+ "BDEPEND": "dev-lang/perl",
+ "DEPEND": ">=sys-apps/util-linux-2.30:0= >=dev-libs/libgcrypt-1.4.5:0= virtual/libcrypt:0/2= dev-libs/libpcre2",
+ "RDEPEND": ">=sys-apps/util-linux-2.30:0= >=dev-libs/libgcrypt-1.4.5:0= virtual/libcrypt:0/2= dev-libs/libpcre2",
+ },
+ "sys-apps/util-linux-2.38.1-r2": {
+ "EAPI": "8",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ "DEPEND": "virtual/libcrypt:0/2= sys-libs/zlib:0/1= virtual/libudev:0/1= dev-libs/libpcre2:0/3=",
+ "RDEPEND": "sys-apps/systemd sys-libs/zlib:0/1= virtual/libudev:0/1= dev-libs/libpcre2:0/3=",
+ },
+ "sys-devel/automake-1.16.5-r1": {
+ "EAPI": "8",
+ "BDEPEND": "app-alternatives/gzip",
+ "RDEPEND": ">=dev-lang/perl-5.6",
+ },
+ "sys-libs/glibc-2.37-r7": {
+ "EAPI": "8",
+ "BDEPEND": "sys-apps/locale-gen",
+ "IDEPEND": "sys-apps/locale-gen",
+ "RDEPEND": "dev-lang/perl",
+ },
+ "sys-libs/libxcrypt-4.4.36": {
+ "BDEPEND": "dev-lang/perl",
+ "DEPEND": "sys-libs/glibc",
+ "RDEPEND": "sys-libs/glibc",
+ },
+ "sys-libs/zlib-1.2.13-r2": {
+ "EAPI": "8",
+ "SLOT": "0/1",
+ "BDEPEND": ">=sys-devel/automake-1.16.5",
+ },
+ "virtual/libcrypt-2-r1": {
+ "EAPI": "8",
+ "SLOT": "0/2",
+ "RDEPEND": "sys-libs/libxcrypt",
+ },
+ "virtual/libudev-251-r2": {
+ "EAPI": "8",
+ "SLOT": "0/1",
+ "RDEPEND": ">=sys-apps/systemd-251:0/2",
+ },
+ }
+
+ world = [
+ "app-alternatives/gzip",
+ "app-arch/gzip",
+ "app-arch/zstd",
+ "sys-apps/systemd",
+ ]
+
+ user_config = {
+ "package.use": ("app-alternatives/gzip -reference pigz",),
+ }
+
+ test_cases = (
+ ResolverPlaygroundTestCase(
+ ["app-alternatives/gzip", "sys-libs/zlib"],
+ success=True,
+ mergelist=[
+ "sys-libs/zlib-1.3-r1",
+ "app-arch/pigz-2.8",
+ "app-alternatives/gzip-1",
+ ],
+ ),
+ )
+
+ playground = ResolverPlayground(
+ ebuilds=ebuilds,
+ installed=installed,
+ world=world,
+ user_config=user_config,
+ )
+ try:
+ for test_case in test_cases:
+ playground.run_TestCase(test_case)
+ self.assertEqual(test_case.test_success, True, test_case.fail_msg)
+ finally:
+ playground.cleanup()
next reply other threads:[~2023-11-18 1:16 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-18 1:16 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-12 19:50 [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/ Sam James
2025-03-13 17:06 Sam James
2025-03-09 21:54 Sam James
2025-03-09 21:54 Sam James
2024-05-26 18:58 Zac Medico
2024-05-26 18:48 Zac Medico
2024-02-09 21:40 Zac Medico
2023-12-24 19:30 Zac Medico
2023-11-28 22:26 Sam James
2023-06-19 21:17 Sam James
2023-06-16 3:34 Sam James
2023-06-16 3:34 Sam James
2023-05-26 15:45 Sam James
2023-05-26 15:45 Sam James
2023-05-26 15:45 Sam James
2023-02-19 19:19 Sam James
2023-01-02 20:45 Mike Gilbert
2022-07-25 22:01 Zac Medico
2022-07-25 20:44 Mike Gilbert
2022-02-14 0:14 Zac Medico
2021-05-24 6:33 Zac Medico
2021-03-28 6:21 Zac Medico
2021-03-06 9:53 Zac Medico
2021-03-01 8:56 Zac Medico
2021-03-01 6:43 Zac Medico
2021-02-23 22:39 Zac Medico
2021-01-11 3:40 Zac Medico
2020-12-02 17:33 Zac Medico
2020-11-15 5:56 Zac Medico
2020-09-19 20:28 Zac Medico
2020-08-30 22:39 Zac Medico
2020-08-03 23:28 Zac Medico
2020-08-03 23:28 Zac Medico
2020-08-03 23:28 Zac Medico
2020-08-03 21:42 Zac Medico
2020-08-03 19:30 Zac Medico
2020-04-11 23:50 Zac Medico
2020-02-10 3:19 Zac Medico
2020-02-10 2:29 Zac Medico
2020-02-09 23:57 Zac Medico
2020-02-09 23:15 Zac Medico
2020-02-08 8:35 Zac Medico
2020-02-01 4:48 Zac Medico
2020-01-26 6:27 Zac Medico
2020-01-26 0:20 Zac Medico
2020-01-25 22:37 Zac Medico
2020-01-21 2:37 Zac Medico
2019-12-25 8:18 Zac Medico
2019-12-22 0:35 Zac Medico
2019-12-22 0:28 Zac Medico
2019-12-21 23:54 Zac Medico
2019-11-16 9:57 Zac Medico
2019-10-21 8:26 Zac Medico
2019-10-11 4:00 Zac Medico
2019-09-15 3:36 Zac Medico
2019-09-12 19:43 Zac Medico
2019-09-12 19:05 Zac Medico
2019-01-20 19:27 Zac Medico
2018-12-30 2:34 Zac Medico
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=1700207835.1525b51fb1df477f8801470509e786558ab153dc.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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