Merge 3.5 (test_eintr)

diff --cc Lib/test/eintrdata/eintr_tester.py
index 9de2b6b147310bbd851d31e3041e0fb98f334302,e3c36f9ce3688eb9e85189613c128d6379c0cf62..ee6e75bb9944ff71da9799babcd1fd768af8a2f5
--- 1/Lib/test/eintrdata/eintr_tester.py
--- 2/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)