Tweak test__issues461_471.py for coverage.

src/greentest/greentest/sysinfo.py

@@ -40,7 +40,7 @@ else:
     DEBUG = False
 
 RUN_LEAKCHECKS = os.getenv('GEVENTTEST_LEAKCHECK')
-RUN_COVERAGE = os.getenv("COVERAGE_PROCESS_START")
+RUN_COVERAGE = os.getenv("COVERAGE_PROCESS_START") or os.getenv("GEVENTTEST_COVERAGE")
 
 # Generally, ignore the portions that are only implemented
 # on particular platforms; they generally contain partial

src/greentest/test__issues461_471.py

@@ -7,7 +7,6 @@ handling of KeyboardInterrupt.
 '''
 
 import sys
-WIN = sys.platform.startswith("win")
 
 if sys.argv[1:] == ['subprocess']:
     import gevent
@@ -29,7 +28,19 @@ else:
     from subprocess import Popen, PIPE
     import time
 
-    if sys.platform.startswith('win'):
+    import unittest
+    import greentest
+    from greentest.sysinfo import CFFI_BACKEND
+    from greentest.sysinfo import RUN_COVERAGE
+    from greentest.sysinfo import WIN
+
+    class Test(unittest.TestCase):
+
+        @unittest.skipIf(CFFI_BACKEND and RUN_COVERAGE,
+                         "Interferes with the timing")
+        def test_hang(self):
+
+            if WIN:
                 from subprocess import CREATE_NEW_PROCESS_GROUP
                 kwargs = {'creationflags': CREATE_NEW_PROCESS_GROUP}
             else:
@@ -43,7 +54,7 @@ else:
             # it does on other platforms. Universal newlines is broken on Py3, so the best
             # thing to do is to strip it
             line = line.strip()
-    assert line == 'ready', line
+            self.assertEqual(line, 'ready')
             # On Windows, we have to send the CTRL_BREAK_EVENT (which seems to terminate the process); SIGINT triggers
             # "ValueError: Unsupported signal: 2". The CTRL_C_EVENT is ignored on Python 3 (but not Python 2).
             # So this test doesn't test much on Windows.
@@ -51,7 +62,7 @@ else:
             p.send_signal(signal_to_send)
             # Wait a few seconds for child process to die. Sometimes signal delivery is delayed
             # or even swallowed by Python, so send the signal a few more times if necessary
-    wait_seconds = 10.0
+            wait_seconds = 15.0
             now = time.time()
             midtime = now + (wait_seconds / 2.0)
             endtime = time.time() + wait_seconds
@@ -64,15 +75,16 @@ else:
                 time.sleep(0.1)
             else:
                 # Kill unresponsive child and exit with error 1
-        sys.stderr.write(__file__)
-        sys.stderr.write(": Failed to wait for child\n")
                 p.terminate()
                 p.wait()
-        sys.exit(1)
+                raise AssertionError("Failed to wait for child")
 
             # If we get here, it's because we caused the process to exit; it
             # didn't hang. Under Windows, however, we have to use CTRL_BREAK_EVENT,
             # which has an arbitrary returncode depending on versions (so does CTRL_C_EVENT
             # on Python 2). We still
             # count this as success.
-    sys.exit(p.returncode if not WIN else 0)
+            self.assertEqual(p.returncode if not WIN else 0, 0)
+
+    if __name__ == '__main__':
+        greentest.main()