[Python-checkins] cpython (merge 3.2 -> default): #15802: Fix test logic in TestMaildir.test_create_tmp

Sat Sep 1 13:30:49 CEST 2012

http://hg.python.org/cpython/rev/e2fec0144bf8
changeset: 78827:e2fec0144bf8
parent: 78822:74f6d87cd471
parent: 78825:aef4a2ba3210
user: Petri Lehtinen <petri at digip.org>
date: Sat Sep 01 14:27:24 2012 +0300
summary:
 #15802: Fix test logic in TestMaildir.test_create_tmp
files:
 Lib/test/test_mailbox.py | 10 +++++-----
 Misc/NEWS | 3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -763,13 +763,13 @@
 self.assertIsNot(match, None, "Invalid file name: '%s'" % tail)
 groups = match.groups()
 if previous_groups is not None:
- self.assertTrue(int(groups[0] >= previous_groups[0]),
+ self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
 "Non-monotonic seconds: '%s' before '%s'" %
 (previous_groups[0], groups[0]))
- self.assertTrue(int(groups[1] >= previous_groups[1]) or
- groups[0] != groups[1],
- "Non-monotonic milliseconds: '%s' before '%s'" %
- (previous_groups[1], groups[1]))
+ if int(groups[0]) == int(previous_groups[0]):
+ self.assertGreaterEqual(int(groups[1]), int(previous_groups[1]),
+ "Non-monotonic milliseconds: '%s' before '%s'" %
+ (previous_groups[1], groups[1]))
 self.assertEqual(int(groups[2]), pid,
 "Process ID mismatch: '%s' should be '%s'" %
 (groups[2], pid))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@
 Tests
 -----
 
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+ by Serhiy Storchaka.
+
 Build
 -----
 
-- 
Repository URL: http://hg.python.org/cpython
