[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (test_eintr)

Mon Oct 12 17:37:44 EDT 2015

https://hg.python.org/cpython/rev/370af83da32c
changeset: 98717:370af83da32c
parent: 98715:8e27f8398a4f
parent: 98716:605eda657884
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Oct 12 23:37:31 2015 +0200
summary:
 Merge 3.5 (test_eintr)
files:
 Lib/test/eintrdata/eintr_tester.py | 10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@ -66,11 +66,6 @@
 if hasattr(faulthandler, 'cancel_dump_traceback_later'):
 faulthandler.cancel_dump_traceback_later()
 
- @classmethod
- def _sleep(cls):
- # default sleep time
- time.sleep(cls.sleep_time)
-
 def subprocess(self, *args, **kw):
 cmd_args = (sys.executable, '-c') + args
 return subprocess.Popen(cmd_args, **kw)
@@ -382,6 +377,11 @@
 @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'),
 'need signal.sigwaitinfo()')
 def test_sigwaitinfo(self):
+ # Issue #25277: The sleep is a weak synchronization between the parent
+ # and the child process. If the sleep is too low, the test hangs on
+ # slow or highly loaded systems.
+ self.sleep_time = 2.0
+
 signum = signal.SIGUSR1
 pid = os.getpid()
 
-- 
Repository URL: https://hg.python.org/cpython
