changeset: 78825:aef4a2ba3210 branch: 3.2 parent: 78821:1b614921aefa user: Petri Lehtinen date: Sat Sep 01 14:22:36 2012 +0300 files: Lib/test/test_mailbox.py Misc/NEWS description: #15802: Fix test logic in TestMaildir.test_create_tmp diff -r 1b614921aefa -r aef4a2ba3210 Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py Fri Aug 31 22:45:20 2012 -0400 +++ b/Lib/test/test_mailbox.py Sat Sep 01 14:22:36 2012 +0300 @@ -759,13 +759,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 -r 1b614921aefa -r aef4a2ba3210 Misc/NEWS --- a/Misc/NEWS Fri Aug 31 22:45:20 2012 -0400 +++ b/Misc/NEWS Sat Sep 01 14:22:36 2012 +0300 @@ -457,6 +457,9 @@ 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.