Skip to content

Commit

Permalink
bpo-37278: Fix test_asyncio ProactorLoopCtrlC (GH-14074)
Browse files Browse the repository at this point in the history
Join the thread to prevent leaking a running thread and leaking a
reference.

Cleanup also the test:

* asyncioWindowsProactorEventLoopPolicy became the default policy,
  there is no need to set it manually.
* Only start the thread once the loop is running.
* Use a shorter sleep in the thread (100 ms rather than 1 sec).
* Use close_loop(loop) rather than loop.close().
* Use longer variable names.
(cherry picked from commit 0755945)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
  • Loading branch information
miss-islington and vstinner committed Jun 14, 2019
1 parent 7cd581a commit 8b66dbb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Lib/test/test_asyncio/test_windows_events.py
Expand Up @@ -45,20 +45,21 @@ class ProactorLoopCtrlC(test_utils.TestCase):
def test_ctrl_c(self):

def SIGINT_after_delay():
time.sleep(1)
time.sleep(0.1)
signal.raise_signal(signal.SIGINT)

asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
l = asyncio.get_event_loop()
thread = threading.Thread(target=SIGINT_after_delay)
loop = asyncio.get_event_loop()
try:
t = threading.Thread(target=SIGINT_after_delay)
t.start()
l.run_forever()
# only start the loop once the event loop is running
loop.call_soon(thread.start)
loop.run_forever()
self.fail("should not fall through 'run_forever'")
except KeyboardInterrupt:
pass
finally:
l.close()
self.close_loop(loop)
thread.join()


class ProactorTests(test_utils.TestCase):
Expand Down
@@ -0,0 +1,2 @@
Fix test_asyncio ProactorLoopCtrlC: join the thread to prevent leaking a
running thread and leaking a reference.

0 comments on commit 8b66dbb

Please sign in to comment.