summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2023-12-10 11:38:49 (GMT)
committerGitHub <noreply@github.com>2023-12-10 11:38:49 (GMT)
commitdd2ebdf89ff144e89db180bd552c50615f712cb2 (patch)
tree1bfeb6613807e0b8f7c239f3ee79e3918f2952c8
parent5bf7580d72259d7d64f5ee8cfc2df677de5310a4 (diff)
downloadcpython-dd2ebdf89ff144e89db180bd552c50615f712cb2.zip
cpython-dd2ebdf89ff144e89db180bd552c50615f712cb2.tar.gz
cpython-dd2ebdf89ff144e89db180bd552c50615f712cb2.tar.bz2
gh-109980: Fix test_tarfile_vs_tar on macOS (#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.
-rw-r--r--Lib/test/test_shutil.py11
-rw-r--r--Misc/NEWS.d/next/Tests/2023-12-09-21-27-46.gh-issue-109980.y--500.rst2
2 files changed, 13 insertions, 0 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index d7061b2..b29d316 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1670,6 +1670,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 0000000..c475a33
--- /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`.