From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 29 Oct 2010 10:59:08 +0000 (+0000)
Subject: test_tarfile: dump mtime as hexadecimal on test_extractall failure
X-Git-Tag: v3.2a4~301
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26bfb5ab82dbba8d771ffc47005865682039f7a8;p=thirdparty%2FPython%2Fcpython.git

test_tarfile: dump mtime as hexadecimal on test_extractall failure
---

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 8dc3ff9aa273..7a0d677ea0f8 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -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()