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: Sun, 15 Nov 2020 05:56:43 +0000 (UTC) [thread overview]
Message-ID: <1605419677.e9c0ef7609e8e2068af8c9c7138f1a2dc22fcfb0.zmedico@gentoo> (raw)
commit: e9c0ef7609e8e2068af8c9c7138f1a2dc22fcfb0
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 04:25:22 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 05:54:37 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e9c0ef76
Add slot operator := BDEPEND unit tests for bug 752153
Test these two distinct cases:
1) Regular dev-lang/go upgrade, with rebuild of packages that
have dev-lang/go:= in BDEPEND.
2) Rebuild of packages that have dev-lang/go:= in BDEPEND, after
the built slot operator deps have already been broken by an
earlier dev-lang/go upgrade.
Bug: https://bugs.gentoo.org/752153
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.../tests/resolver/test_slot_operator_bdeps.py | 209 +++++++++++++++++++++
1 file changed, 209 insertions(+)
diff --git a/lib/portage/tests/resolver/test_slot_operator_bdeps.py b/lib/portage/tests/resolver/test_slot_operator_bdeps.py
new file mode 100644
index 000000000..f5b1bce1b
--- /dev/null
+++ b/lib/portage/tests/resolver/test_slot_operator_bdeps.py
@@ -0,0 +1,209 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (ResolverPlayground,
+ ResolverPlaygroundTestCase)
+
+class SlotOperatorBdependTestCase(TestCase):
+
+ def testSlotOperatorBdepend(self):
+ """
+ Test regular dev-lang/go upgrade, with rebuild of packages
+ that have dev-lang/go:= in BDEPEND.
+ """
+
+ ebuilds = {
+ "app-emulation/buildah-1.16.1":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:=",
+ },
+
+ "app-emulation/libpod-2.1.0":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:=",
+ },
+
+ "dev-lang/go-1.15.5":{
+ "EAPI": "7",
+ "SLOT": "0/1.15.5"
+ },
+
+ "dev-lang/go-1.14.12" : {
+ "EAPI": "7",
+ "SLOT": "0/1.14.12"
+ },
+ }
+
+ binpkgs = {
+ "app-emulation/buildah-1.16.1":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "app-emulation/libpod-2.1.0":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "dev-lang/go-1.14.12" : {
+ "EAPI": "7",
+ "SLOT": "0/1.14.12"
+ },
+ }
+
+ installed = {
+ "app-emulation/buildah-1.16.1":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "app-emulation/libpod-2.1.0":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "dev-lang/go-1.14.12" : {
+ "EAPI": "7",
+ "SLOT": "0/1.14.12"
+ },
+ }
+
+ world = ["app-emulation/buildah", "app-emulation/libpod"]
+
+ test_cases = (
+
+ # Test rebuild triggered by slot operator := dependency in BDEPEND.
+ ResolverPlaygroundTestCase(
+ ["@world"],
+ options = {
+ "--update": True,
+ "--deep": True,
+ },
+ success = True,
+ mergelist = ["dev-lang/go-1.15.5", "app-emulation/buildah-1.16.1", "app-emulation/libpod-2.1.0"]
+ ),
+
+ # Test the above case with --usepkg --with-bdeps=y. It should not use the
+ # binary packages because rebuild is needed.
+ ResolverPlaygroundTestCase(
+ ["@world"],
+ options = {
+ "--usepkg": True,
+ "--with-bdeps": "y",
+ "--update": True,
+ "--deep": True,
+ },
+ success = True,
+ mergelist = ["dev-lang/go-1.15.5", "app-emulation/buildah-1.16.1", "app-emulation/libpod-2.1.0"]
+ ),
+ )
+
+ playground = ResolverPlayground(ebuilds=ebuilds, binpkgs=binpkgs,
+ installed=installed, world=world, debug=False)
+ 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.debug = False
+ playground.cleanup()
+
+ def testSlotOperatorBdependAfterBreakage(self):
+ """
+ Test rebuild of packages that have dev-lang/go:= in BDEPEND,
+ after the built slot operator deps have already been broken
+ by an earlier dev-lang/go upgrade.
+ """
+
+ ebuilds = {
+ "app-emulation/buildah-1.16.1":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:=",
+ },
+
+ "app-emulation/libpod-2.1.0":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:=",
+ },
+
+ "dev-lang/go-1.15.5":{
+ "EAPI": "7",
+ "SLOT": "0/1.15.5"
+ },
+
+ "dev-lang/go-1.14.12" : {
+ "EAPI": "7",
+ "SLOT": "0/1.14.12"
+ },
+ }
+
+ binpkgs = {
+ "app-emulation/buildah-1.16.1":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "app-emulation/libpod-2.1.0":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "dev-lang/go-1.14.12" : {
+ "EAPI": "7",
+ "SLOT": "0/1.14.12"
+ },
+ "dev-lang/go-1.15.5" : {
+ "EAPI": "7",
+ "SLOT": "0/1.15.5"
+ },
+ }
+
+ installed = {
+ "app-emulation/buildah-1.16.1":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "app-emulation/libpod-2.1.0":{
+ "EAPI": "7",
+ "BDEPEND": "dev-lang/go:0/1.14.12=",
+ },
+ "dev-lang/go-1.15.5" : {
+ "EAPI": "7",
+ "SLOT": "0/1.15.5"
+ },
+ }
+
+ world = ["app-emulation/buildah", "app-emulation/libpod"]
+
+ test_cases = (
+
+ # Test rebuild triggered by slot operator := dependency in BDEPEND.
+ ResolverPlaygroundTestCase(
+ ["@world"],
+ options = {
+ "--update": True,
+ "--deep": True,
+ },
+ success = True,
+ mergelist = ["app-emulation/buildah-1.16.1", "app-emulation/libpod-2.1.0"]
+ ),
+
+ # Test the above case with --usepkg --with-bdeps=y. It should not use the
+ # binary packages because rebuild is needed.
+ ResolverPlaygroundTestCase(
+ ["@world"],
+ options = {
+ "--usepkg": True,
+ "--with-bdeps": "y",
+ "--update": True,
+ "--deep": True,
+ },
+ success = True,
+ mergelist = ["app-emulation/buildah-1.16.1", "app-emulation/libpod-2.1.0"]
+ ),
+ )
+
+ playground = ResolverPlayground(ebuilds=ebuilds, binpkgs=binpkgs,
+ installed=installed, world=world, debug=False)
+ 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.debug = False
+ playground.cleanup()
next reply other threads:[~2020-11-15 5:56 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 5:56 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-27 3:33 [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/ Zac Medico
2025-04-12 19:50 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-11-18 1:16 Zac Medico
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-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=1605419677.e9c0ef7609e8e2068af8c9c7138f1a2dc22fcfb0.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