]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-39460: Fix test_zipfile.test_add_file_after_2107() (GH-18247)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 29 Jan 2020 14:41:49 +0000 (06:41 -0800)
committerGitHub <noreply@github.com>
Wed, 29 Jan 2020 14:41:49 +0000 (06:41 -0800)
XFS filesystem is limited to 32-bit timestamp, but the utimensat()
syscall doesn't fail. Moreover, there is a VFS bug which returns
a cached timestamp which is different than the value on disk.

https://bugzilla.redhat.com/show_bug.cgi?id=1795576
https://bugs.python.org/issue39460GH-msg360952
(cherry picked from commit 3cb49b62e61208efcefbc04414e769fc173f205d)

Co-authored-by: Victor Stinner <vstinner@python.org>
Lib/test/test_zipfile.py

index f03c044eae3a6027df5adea3532ea17f3a1f915b..0737c343cbf5fc71957818eb99156834a3b5da8c 100644 (file)
@@ -602,6 +602,18 @@ class StoredTestsWithSourceFile(AbstractTestsWithSourceFile,
         except OverflowError:
             self.skipTest('Host fs cannot set timestamp to required value.')
 
+        mtime_ns = os.stat(TESTFN).st_mtime_ns
+        if mtime_ns != (4386268800 * 10**9):
+            # XFS filesystem is limited to 32-bit timestamp, but the syscall
+            # didn't fail. Moreover, there is a VFS bug which returns
+            # a cached timestamp which is different than the value on disk.
+            #
+            # Test st_mtime_ns rather than st_mtime to avoid rounding issues.
+            #
+            # https://bugzilla.redhat.com/show_bug.cgi?id=1795576
+            # https://bugs.python.org/issue39460#msg360952
+            self.skipTest(f"Linux VFS/XFS kernel bug detected: {mtime_ns=}")
+
         with zipfile.ZipFile(TESTFN2, "w") as zipfp:
             self.assertRaises(struct.error, zipfp.write, TESTFN)