]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-26067: Do not fail test_shutil / chown when gid/uid cannot be resolved (#19032)
authorMatthias Braun <matze@braunis.de>
Tue, 17 Mar 2020 16:51:44 +0000 (09:51 -0700)
committerGitHub <noreply@github.com>
Tue, 17 Mar 2020 16:51:44 +0000 (09:51 -0700)
* bpo-26067: Do not fail test_shutil.chown when gid/uid cannot be resolved

There is no guarantee that the users primary uid or gid can be resolved
in the unix group/account databases. Skip the last part of the chown
test if we cannot resolve the gid or uid to a name.

* ðŸ“œðŸ¤– Added by blurb_it.

* Address review feedback

* address review feedback correctly

* fix typo

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Lib/test/test_shutil.py
Misc/NEWS.d/next/Tests/2020-03-16-20-54-55.bpo-26067.m18_VV.rst [new file with mode: 0644]

index 076c450e09bf69195c28d94616ecfedae414d253..b9fdfd1350a0961e943368d63bd9e52bd15a097f 100644 (file)
@@ -1666,12 +1666,17 @@ class TestMisc(BaseTest, unittest.TestCase):
         shutil.chown(dirname, group=gid)
         check_chown(dirname, gid=gid)
 
-        user = pwd.getpwuid(uid)[0]
-        group = grp.getgrgid(gid)[0]
-        shutil.chown(filename, user, group)
-        check_chown(filename, uid, gid)
-        shutil.chown(dirname, user, group)
-        check_chown(dirname, uid, gid)
+        try:
+            user = pwd.getpwuid(uid)[0]
+            group = grp.getgrgid(gid)[0]
+        except KeyError:
+            # On some systems uid/gid cannot be resolved.
+            pass
+        else:
+            shutil.chown(filename, user, group)
+            check_chown(filename, uid, gid)
+            shutil.chown(dirname, user, group)
+            check_chown(dirname, uid, gid)
 
 
 class TestWhich(BaseTest, unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Tests/2020-03-16-20-54-55.bpo-26067.m18_VV.rst b/Misc/NEWS.d/next/Tests/2020-03-16-20-54-55.bpo-26067.m18_VV.rst
new file mode 100644 (file)
index 0000000..8b897a8
--- /dev/null
@@ -0,0 +1 @@
+Do not fail test_shutil test_chown test when uid or gid of user cannot be resolved to a name.