Revert changeset d927047b1d8eb87738676980a24930d053ba2150

Sorry, it was a mistake, the patch is still under review: issue #23646.

2 files changed, 8 insertions, 26 deletions

diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py
index 8547576..40dca84 100644
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@ -252,23 +252,8 @@ class SocketEINTRTest(EINTRBaseTest):
                         lambda path: os.close(os.open(path, os.O_WRONLY)))
 
 
-@unittest.skipUnless(hasattr(signal, "setitimer"), "requires setitimer()")
-class TimeEINTRTest(EINTRBaseTest):
-    """ EINTR tests for the time module. """
-
-    def test_sleep(self):
-        t0 = time.monotonic()
-        time.sleep(2)
-        signal.alarm(0)
-        dt = time.monotonic() - t0
-        self.assertGreaterEqual(dt, 1.9)
-
-
 def test_main():
-    support.run_unittest(
-        OSEINTRTest,
-        SocketEINTRTest,
-        TimeEINTRTest)
+    support.run_unittest(OSEINTRTest, SocketEINTRTest)
 
 
 if __name__ == "__main__":
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 6ecff9e..774fc80 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -419,20 +419,17 @@ class WakeupSignalTests(unittest.TestCase):
             TIMEOUT_HALF = 5
 
             signal.alarm(1)
-
+            before_time = time.time()
             # We attempt to get a signal during the sleep,
             # before select is called
-            try:
-                select.select([], [], [], TIMEOUT_FULL)
-            except InterruptedError:
-                pass
-            else:
-                raise Exception("select() was not interrupted")
-
-            before_time = time.time()
+            time.sleep(TIMEOUT_FULL)
+            mid_time = time.time()
+            dt = mid_time - before_time
+            if dt >= TIMEOUT_HALF:
+                raise Exception("%s >= %s" % (dt, TIMEOUT_HALF))
             select.select([read], [], [], TIMEOUT_FULL)
             after_time = time.time()
-            dt = after_time - before_time
+            dt = after_time - mid_time
             if dt >= TIMEOUT_HALF:
                 raise Exception("%s >= %s" % (dt, TIMEOUT_HALF))
         """, signal.SIGALRM)