mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-23 07:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

gh-95675: fix uid and gid at test_add_dir_getmember (gh-102207)

Browse source 
Co-authored-by: Seonkyo Ok <seonkyo.ok@linecorp.com>
This commit is contained in:
SKO 2023-02-25 11:26:40 +09:00 • committed by GitHub
parent 54dfa14c5a
commit 56e93c8020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_tarfile.py
View file

@ -225,18 +225,19 @@ class UstarReadTest(ReadTest, unittest.TestCase):
self.add_dir_and_getmember('bar') self.add_dir_and_getmember('bar')
self.add_dir_and_getmember('a'*101) self.add_dir_and_getmember('a'*101)
@unittest.skipIf( @unittest.skipUnless(hasattr(os, "getuid") and hasattr(os, "getgid"),
(hasattr(os, 'getuid') and os.getuid() > 0o777_7777) or "Missing getuid or getgid implementation")
(hasattr(os, 'getgid') and os.getgid() > 0o777_7777),
"uid or gid too high for USTAR format."
)
def add_dir_and_getmember(self, name): def add_dir_and_getmember(self, name):
def filter(tarinfo):
tarinfo.uid = tarinfo.gid = 100
return tarinfo
with os_helper.temp_cwd(): with os_helper.temp_cwd():
with tarfile.open(tmpname, 'w') as tar: with tarfile.open(tmpname, 'w') as tar:
tar.format = tarfile.USTAR_FORMAT tar.format = tarfile.USTAR_FORMAT
try: try:
os.mkdir(name) os.mkdir(name)
tar.add(name) tar.add(name, filter=filter)
finally: finally:
os.rmdir(name) os.rmdir(name)
with tarfile.open(tmpname) as tar: with tarfile.open(tmpname) as tar:

1
Misc/ACKS
View file

@ -1308,6 +1308,7 @@ Jon Oberheide
Milan Oberkirch Milan Oberkirch
Pascal Oberndoerfer Pascal Oberndoerfer
Géry Ogam Géry Ogam
Seonkyo Ok
Jeffrey Ollie Jeffrey Ollie
Adam Olsen Adam Olsen
Bryan Olson Bryan Olson