From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:55:48 +0000 (-0800) Subject: [3.11] gh-95675: fix uid and gid at test_add_dir_getmember (gh-102207) (gh-102231) X-Git-Tag: v3.11.3~113 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9da3e7f3894aceefed5543cdd4e236cc83bfa003;p=thirdparty%2FPython%2Fcpython.git [3.11] gh-95675: fix uid and gid at test_add_dir_getmember (gh-102207) (gh-102231) gh-95675: fix uid and gid at test_add_dir_getmember (gh-102207) (cherry picked from commit 56e93c8020e89e1712aa238574bca2076a225028) Co-authored-by: Seonkyo Ok --- diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 7a0830f68602..bde105f78a82 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -225,18 +225,19 @@ class UstarReadTest(ReadTest, unittest.TestCase): self.add_dir_and_getmember('bar') self.add_dir_and_getmember('a'*101) - @unittest.skipIf( - (hasattr(os, 'getuid') and os.getuid() > 0o777_7777) or - (hasattr(os, 'getgid') and os.getgid() > 0o777_7777), - "uid or gid too high for USTAR format." - ) + @unittest.skipUnless(hasattr(os, "getuid") and hasattr(os, "getgid"), + "Missing getuid or getgid implementation") def add_dir_and_getmember(self, name): + def filter(tarinfo): + tarinfo.uid = tarinfo.gid = 100 + return tarinfo + with os_helper.temp_cwd(): with tarfile.open(tmpname, 'w') as tar: tar.format = tarfile.USTAR_FORMAT try: os.mkdir(name) - tar.add(name) + tar.add(name, filter=filter) finally: os.rmdir(name) with tarfile.open(tmpname) as tar: diff --git a/Misc/ACKS b/Misc/ACKS index 95e0589076c6..22df1b998fb1 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1297,6 +1297,7 @@ Jon Oberheide Milan Oberkirch Pascal Oberndoerfer Géry Ogam +Seonkyo Ok Jeffrey Ollie Adam Olsen Bryan Olson