From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 5 Feb 2023 19:46:50 +0000 (-0800)
Subject: gh-101334: Don't force USTAR format in test_tarfile. (GH-101572)
X-Git-Tag: v3.10.10~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=435fcb07e5e7caea4253e39e1e2de80e58be8ea2;p=thirdparty%2FPython%2Fcpython.git

gh-101334: Don't force USTAR format in test_tarfile. (GH-101572)


That causes the test to fail when run using a high UID as that ancient format
cannot represent it. The current default (PAX) and the old default (GNU) both
support high UIDs.
(cherry picked from commit ffcb8220d7a8c8ca169b467d9e4a752874f68af2)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
---

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index c658cca7a780..cba95e9320ec 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -225,6 +225,11 @@ 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."
+    )
     def add_dir_and_getmember(self, name):
         with os_helper.temp_cwd():
             with tarfile.open(tmpname, 'w') as tar:
diff --git a/Misc/NEWS.d/next/Tests/2023-02-04-17-24-33.gh-issue-101334._yOqwg.rst b/Misc/NEWS.d/next/Tests/2023-02-04-17-24-33.gh-issue-101334._yOqwg.rst
new file mode 100644
index 000000000000..2a95fd9ae53c
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2023-02-04-17-24-33.gh-issue-101334._yOqwg.rst
@@ -0,0 +1 @@
+``test_tarfile`` has been updated to pass when run as a high UID.