From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D806215806E for ; Fri, 26 May 2023 15:45:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B436CE08C8; Fri, 26 May 2023 15:45:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88351E08C8 for ; Fri, 26 May 2023 15:45:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A5FB340FC0 for ; Fri, 26 May 2023 15:45:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A37F9A86 for ; Fri, 26 May 2023 15:45:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685115878.1f7afc93d4e3df77915019ca6d7b02da52ecf3b8.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/emerge/test_config_protect.py lib/portage/tests/emerge/test_emerge_blocker_file_collision.py lib/portage/tests/emerge/test_emerge_slot_abi.py lib/portage/tests/emerge/test_simple.py X-VCS-Directories: lib/portage/tests/emerge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1f7afc93d4e3df77915019ca6d7b02da52ecf3b8 X-VCS-Branch: master Date: Fri, 26 May 2023 15:45:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 33b3a6fc-62ce-446b-9956-54cdae7d481d X-Archives-Hash: 9eaab9c264cd21fc0ad33dbf22acb433 commit: 1f7afc93d4e3df77915019ca6d7b02da52ecf3b8 Author: David Palao gmail com> AuthorDate: Fri May 26 09:27:42 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 26 15:44:38 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1f7afc93 tests: fix the inst gid and uid in some envs for tests ...where they were, by mistake, switched Signed-off-by: David Palao gmail.com> Signed-off-by: Sam James gentoo.org> lib/portage/tests/emerge/test_config_protect.py | 4 ++-- lib/portage/tests/emerge/test_emerge_blocker_file_collision.py | 4 ++-- lib/portage/tests/emerge/test_emerge_slot_abi.py | 4 ++-- lib/portage/tests/emerge/test_simple.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/portage/tests/emerge/test_config_protect.py b/lib/portage/tests/emerge/test_config_protect.py index 97d0c236f..ec359833e 100644 --- a/lib/portage/tests/emerge/test_config_protect.py +++ b/lib/portage/tests/emerge/test_config_protect.py @@ -217,8 +217,8 @@ src_install() { "INFODIR": "", "INFOPATH": "", "PATH": path, - "PORTAGE_INST_GID": str(os.getuid()), # str(portage.data.portage_gid), - "PORTAGE_INST_UID": str(os.getgid()), # str(portage.data.portage_uid), + "PORTAGE_INST_GID": str(os.getgid()), # str(portage.data.portage_gid), + "PORTAGE_INST_UID": str(os.getuid()), # str(portage.data.portage_uid), "PORTAGE_PYTHON": portage_python, "PORTAGE_REPOSITORIES": settings.repositories.config_string(), "PORTAGE_TMPDIR": portage_tmpdir, diff --git a/lib/portage/tests/emerge/test_emerge_blocker_file_collision.py b/lib/portage/tests/emerge/test_emerge_blocker_file_collision.py index d21287401..6f7a96af9 100644 --- a/lib/portage/tests/emerge/test_emerge_blocker_file_collision.py +++ b/lib/portage/tests/emerge/test_emerge_blocker_file_collision.py @@ -121,8 +121,8 @@ src_install() { "PORTAGE_REPOSITORIES": settings.repositories.config_string(), "PYTHONDONTWRITEBYTECODE": os.environ.get("PYTHONDONTWRITEBYTECODE", ""), "PYTHONPATH": pythonpath, - "PORTAGE_INST_GID": str(os.getuid()), - "PORTAGE_INST_UID": str(os.getgid()), + "PORTAGE_INST_GID": str(os.getgid()), + "PORTAGE_INST_UID": str(os.getuid()), } if "__PORTAGE_TEST_HARDLINK_LOCKS" in os.environ: diff --git a/lib/portage/tests/emerge/test_emerge_slot_abi.py b/lib/portage/tests/emerge/test_emerge_slot_abi.py index 51cd3c43c..197685975 100644 --- a/lib/portage/tests/emerge/test_emerge_slot_abi.py +++ b/lib/portage/tests/emerge/test_emerge_slot_abi.py @@ -129,8 +129,8 @@ class SlotAbiEmergeTestCase(TestCase): "PORTAGE_REPOSITORIES": settings.repositories.config_string(), "PYTHONDONTWRITEBYTECODE": os.environ.get("PYTHONDONTWRITEBYTECODE", ""), "PYTHONPATH": pythonpath, - "PORTAGE_INST_GID": str(os.getuid()), - "PORTAGE_INST_UID": str(os.getgid()), + "PORTAGE_INST_GID": str(os.getgid()), + "PORTAGE_INST_UID": str(os.getuid()), } if "__PORTAGE_TEST_HARDLINK_LOCKS" in os.environ: diff --git a/lib/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py index 50b7eee31..ab85ad441 100644 --- a/lib/portage/tests/emerge/test_simple.py +++ b/lib/portage/tests/emerge/test_simple.py @@ -620,7 +620,7 @@ call_has_and_best_version() { "INFOPATH": "", "PATH": path, "PKGDIR": pkgdir, - "PORTAGE_INST_GID": str(os.getuid()), # str(portage.data.portage_gid), + "PORTAGE_INST_GID": str(os.getgid()), # str(portage.data.portage_gid), "PORTAGE_INST_UID": str(os.getuid()), # str(portage.data.portage_uid), "PORTAGE_PYTHON": portage_python, "PORTAGE_REPOSITORIES": settings.repositories.config_string(),