Skip to content

Commit 3e80d21

Browse files
[3.10] gh-95675: fix uid and gid at test_add_dir_getmember (gh-102207) (gh-102230)
gh-95675: fix uid and gid at test_add_dir_getmember (gh-102207) (cherry picked from commit 56e93c8) Co-authored-by: Seonkyo Ok <[email protected]>
1 parent 2e2ab67 commit 3e80d21

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Lib/test/test_tarfile.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,19 @@ def test_add_dir_getmember(self):
225225
self.add_dir_and_getmember('bar')
226226
self.add_dir_and_getmember('a'*101)
227227

228-
@unittest.skipIf(
229-
(hasattr(os, 'getuid') and os.getuid() > 0o777_7777) or
230-
(hasattr(os, 'getgid') and os.getgid() > 0o777_7777),
231-
"uid or gid too high for USTAR format."
232-
)
228+
@unittest.skipUnless(hasattr(os, "getuid") and hasattr(os, "getgid"),
229+
"Missing getuid or getgid implementation")
233230
def add_dir_and_getmember(self, name):
231+
def filter(tarinfo):
232+
tarinfo.uid = tarinfo.gid = 100
233+
return tarinfo
234+
234235
with os_helper.temp_cwd():
235236
with tarfile.open(tmpname, 'w') as tar:
236237
tar.format = tarfile.USTAR_FORMAT
237238
try:
238239
os.mkdir(name)
239-
tar.add(name)
240+
tar.add(name, filter=filter)
240241
finally:
241242
os.rmdir(name)
242243
with tarfile.open(tmpname) as tar:

Misc/ACKS

+1
Original file line numberDiff line numberDiff line change
@@ -1286,6 +1286,7 @@ Jon Oberheide
12861286
Milan Oberkirch
12871287
Pascal Oberndoerfer
12881288
Géry Ogam
1289+
Seonkyo Ok
12891290
Jeffrey Ollie
12901291
Adam Olsen
12911292
Bryan Olson

0 commit comments

Comments
 (0)