From: Petri Lehtinen <petri@digip.org>
Date: Sat, 1 Sep 2012 11:22:36 +0000 (+0300)
Subject: #15802: Fix test logic in TestMaildir.test_create_tmp
X-Git-Tag: v3.2.4rc1~576
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c371b255ff15971f2aac1f1ff4a248718744af3;p=thirdparty%2FPython%2Fcpython.git

#15802: Fix test logic in TestMaildir.test_create_tmp
---

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 65120f7af9b4..b83e2c3d5af2 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -759,13 +759,13 @@ class TestMaildir(TestMailbox, unittest.TestCase):
             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
index c78dc96ee75b..4bb9698ac1d1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -457,6 +457,9 @@ Extension Modules
 Tests
 -----
 
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
 - Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the
   UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected
   tests in test_posix.py to account for this.