From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 10 Nov 2015 17:51:56 +0000 (+0200)
Subject: Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
X-Git-Tag: v3.5.1rc1~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6ce13d9101f51af53101f63a789e252784395ea;p=thirdparty%2FPython%2Fcpython.git

Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic instead of time.clock.
---

c6ce13d9101f51af53101f63a789e252784395ea
diff --cc Lib/test/test_email/test_email.py
index dff3e4b0ca28,84f4e383f914..894b8003cde9
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@@ -3179,7 -3164,10 +3179,7 @@@ Fo
                  self.msgids = []
                  append = self.msgids.append
                  make_msgid = utils.make_msgid
-                 clock = time.clock
 -                try:
 -                    clock = time.monotonic
 -                except AttributeError:
 -                    clock = time.time
++                clock = time.monotonic
                  tfin = clock() + 3.0
                  while clock() < tfin:
                      append(make_msgid(domain='testdomain-string'))