]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
test_tarfile: dump mtime as hexadecimal on test_extractall failure
authorVictor Stinner <victor.stinner@haypocalc.com>
Fri, 29 Oct 2010 10:59:08 +0000 (10:59 +0000)
committerVictor Stinner <victor.stinner@haypocalc.com>
Fri, 29 Oct 2010 10:59:08 +0000 (10:59 +0000)
Lib/test/test_tarfile.py

index 8dc3ff9aa27350db3b41112919be563a8cb9635d..7a0d677ea0f82c9cbc1461f2279ff806e8a3cf92 100644 (file)
@@ -345,7 +345,17 @@ class MiscReadTest(CommonReadTest):
                 if sys.platform != "win32":
                     # Win32 has no support for fine grained permissions.
                     self.assertEqual(tarinfo.mode & 0o777, os.stat(path).st_mode & 0o777)
-                self.assertEqual(tarinfo.mtime, os.path.getmtime(path))
+                def format_mtime(mtime):
+                    if isinstance(mtime, float):
+                        return "{} ({})".format(mtime, mtime.hex())
+                    else:
+                        return "{!r} (int)".format(mtime)
+                file_mtime = os.path.getmtime(path) + 0.001
+                errmsg = "tar mtime {0} != file time {1} of path {2!a}".format(
+                    format_mtime(tarinfo.mtime),
+                    format_mtime(file_mtime),
+                    path)
+                self.assertEqual(tarinfo.mtime, file_mtime, errmsg)
         finally:
             tar.close()