summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-10-12 21:37:31 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-10-12 21:37:31 (GMT)
commit397c42b8cca423b61055e1fa1e60c3f480c01df1 (patch)
tree0f13f3fa7c6fe0b8fc7e5ea021cf1161ede2df3d
parent358af1352689fc10c81690a193ff5414f5f930af (diff)
parent60f26691f5aeff555f27c62aee11efb07e20ecdc (diff)
downloadcpython-397c42b8cca423b61055e1fa1e60c3f480c01df1.zip
cpython-397c42b8cca423b61055e1fa1e60c3f480c01df1.tar.gz
cpython-397c42b8cca423b61055e1fa1e60c3f480c01df1.tar.bz2
Merge 3.5 (test_eintr)
-rw-r--r--Lib/test/eintrdata/eintr_tester.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py
index 9de2b6b..ee6e75b 100644
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@ -66,11 +66,6 @@ class EINTRBaseTest(unittest.TestCase):
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 @@ class SignalEINTRTest(EINTRBaseTest):
@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()