[Python-checkins] r85921 - python/branches/py3k/Lib/test/test_tarfile.py

Fri Oct 29 12:59:08 CEST 2010

Author: victor.stinner
Date: Fri Oct 29 12:59:08 2010
New Revision: 85921
Log:
test_tarfile: dump mtime as hexadecimal on test_extractall failure
Modified:
 python/branches/py3k/Lib/test/test_tarfile.py
Modified: python/branches/py3k/Lib/test/test_tarfile.py
==============================================================================

--- python/branches/py3k/Lib/test/test_tarfile.py	(original)
+++ python/branches/py3k/Lib/test/test_tarfile.py	Fri Oct 29 12:59:08 2010
@@ -345,7 +345,17 @@
 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()
 
