From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:49:39 +0000 (+0100)
Subject: [3.12] gh-109980: Fix test_tarfile_vs_tar on macOS (GH-112905) (#112927)
X-Git-Tag: v3.12.2~346
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68657e2b730af6bdcc5d9f01abc174c2fc0b8e95;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-109980: Fix test_tarfile_vs_tar on macOS (GH-112905) (#112927)

gh-109980: Fix test_tarfile_vs_tar on macOS (GH-112905)

On recentish macOS versions the system tar
command includes system metadata (ACLs, extended attributes
and resource forks) in the tar archive, which
shutil.make_archive will not do. This can cause
spurious test failures.
(cherry picked from commit dd2ebdf89ff144e89db180bd552c50615f712cb2)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
---

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 5fd8fb497f10..0fa8dba03542 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1615,6 +1615,17 @@ class TestArchives(BaseTest, unittest.TestCase):
         # now create another tarball using `tar`
         tarball2 = os.path.join(root_dir, 'archive2.tar')
         tar_cmd = ['tar', '-cf', 'archive2.tar', base_dir]
+        if sys.platform == 'darwin':
+            # macOS tar can include extended attributes,
+            # ACLs and other mac specific metadata into the
+            # archive (an recentish version of the OS).
+            #
+            # This feature can be disabled with the
+            # '--no-mac-metadata' option on macOS 11 or
+            # later.
+            import platform
+            if int(platform.mac_ver()[0].split('.')[0]) >= 11:
+                tar_cmd.insert(1, '--no-mac-metadata')
         subprocess.check_call(tar_cmd, cwd=root_dir,
                               stdout=subprocess.DEVNULL)
 
diff --git a/Misc/NEWS.d/next/Tests/2023-12-09-21-27-46.gh-issue-109980.y--500.rst b/Misc/NEWS.d/next/Tests/2023-12-09-21-27-46.gh-issue-109980.y--500.rst
new file mode 100644
index 000000000000..c475a33919db
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2023-12-09-21-27-46.gh-issue-109980.y--500.rst
@@ -0,0 +1,2 @@
+Fix ``test_tarfile_vs_tar`` in ``test_shutil`` for macOS, where system tar
+can include more information in the archive than :mod:`shutil.make_archive`.