commit:     269d93e424a589c9748451a44029030ffe87f0a8
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Feb 16 12:06:43 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 00:21:03 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=269d93e4

tests: stub PORTAGE_TRUST_HELPER for test_gpkg_gpg_emerge as well

Tests started to fail when run in the ebuild. getuto needs root and
ebuilds run as the portage user. So add this handling for the whole
test rather than just one part.

Fixes: 378cc415b5f2c883b17f5cc2b08d49ce21b8557c
See-Also: daa15374ece245a944d72015bfe87d05a1d1189f
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/portage/pull/1553
Closes: https://github.com/gentoo/portage/pull/1553
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/tests/gpkg/test_gpkg_gpg_emerge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/gpkg/test_gpkg_gpg_emerge.py 
b/lib/portage/tests/gpkg/test_gpkg_gpg_emerge.py
index 6c38c3c68f..f158410f2d 100644
--- a/lib/portage/tests/gpkg/test_gpkg_gpg_emerge.py
+++ b/lib/portage/tests/gpkg/test_gpkg_gpg_emerge.py
@@ -195,7 +195,6 @@ class test_gpkg_gpg_emerge_case(TestCase):
                     returncode=not os.EX_OK,
                     env={
                         "FEATURES": "binpkg-request-signature",
-                        "PORTAGE_TRUST_HELPER": "true",
                     },
                     command=emerge_cmd
                     + (
@@ -235,6 +234,7 @@ class test_gpkg_gpg_emerge_case(TestCase):
                 "PATH": path,
                 "PORTAGE_PYTHON": portage_python,
                 "PORTAGE_REPOSITORIES": settings.repositories.config_string(),
+                "PORTAGE_TRUST_HELPER": "getuto",
                 "PYTHONDONTWRITEBYTECODE": os.environ.get(
                     "PYTHONDONTWRITEBYTECODE", ""
                 ),
@@ -251,7 +251,7 @@ class test_gpkg_gpg_emerge_case(TestCase):
                 user_config_dir,
                 var_cache_edb,
             ]
-            true_symlinks = ["chown", "chgrp"]
+            true_symlinks = ["chown", "chgrp", "getuto"]
             needed_binaries = {
                 "true": (find_binary("true"), True),
             }

Reply via email to