[gentoo-commits] proj/portage:master commit in: lib/portage/tests/emerge/

["Sam James" <sam@gentoo.org>]

commit:     1f7afc93d4e3df77915019ca6d7b02da52ecf3b8
Author:     David Palao <david.palao <AT> gmail <DOT> com>
AuthorDate: Fri May 26 09:27:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <david.palao <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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(),