From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 12 Oct 2015 21:37:31 +0000 (+0200)
Subject: Merge 3.5 (test_eintr)
X-Git-Tag: v3.6.0a1~1239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=397c42b8cca423b61055e1fa1e60c3f480c01df1;p=python

Merge 3.5 (test_eintr)
---

397c42b8cca423b61055e1fa1e60c3f480c01df1
diff --cc Lib/test/eintrdata/eintr_tester.py
index 9de2b6b147,e3c36f9ce3..ee6e75bb99
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@@ -63,14 -58,7 +63,9 @@@ class EINTRBaseTest(unittest.TestCase)
      def tearDownClass(cls):
          cls.stop_alarm()
          signal.signal(signal.SIGALRM, cls.orig_handler)
 +        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)