From 7779762d1b89d07558bdfa07cebe271d52c12287 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Tue, 31 Jan 2023 17:41:10 +0100 Subject: [PATCH 1/2] Test enter event-loop --- .github/workflows/ci.yml | 2 +- ipykernel/kernelbase.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c730f117d..9d73c9d87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: - name: Run the tests timeout-minutes: 10 - run: pytest -W default -vv || pytest --vv -W default --lf + run: pytest -k test_enter_eventloop -W default -vv || pytest -k test_enter_eventloop --vv -W default --lf test_miniumum_versions: name: Test Minimum Versions diff --git a/ipykernel/kernelbase.py b/ipykernel/kernelbase.py index a4ece0994..16d4de0fa 100644 --- a/ipykernel/kernelbase.py +++ b/ipykernel/kernelbase.py @@ -455,6 +455,7 @@ def advance_eventloop(): return self.log.debug("Advancing eventloop %s", eventloop) try: + foo eventloop(self) except KeyboardInterrupt: # Ctrl-C shouldn't crash the kernel From 48369e4a23d9ecf8602aa9893487cc8fcd7a4037 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Wed, 1 Feb 2023 16:26:43 +0100 Subject: [PATCH 2/2] Remove test_enter_eventloop --- .github/workflows/ci.yml | 2 +- ipykernel/kernelbase.py | 1 - ipykernel/tests/test_kernel_direct.py | 21 --------------------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d73c9d87..c730f117d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: - name: Run the tests timeout-minutes: 10 - run: pytest -k test_enter_eventloop -W default -vv || pytest -k test_enter_eventloop --vv -W default --lf + run: pytest -W default -vv || pytest --vv -W default --lf test_miniumum_versions: name: Test Minimum Versions diff --git a/ipykernel/kernelbase.py b/ipykernel/kernelbase.py index 16d4de0fa..a4ece0994 100644 --- a/ipykernel/kernelbase.py +++ b/ipykernel/kernelbase.py @@ -455,7 +455,6 @@ def advance_eventloop(): return self.log.debug("Advancing eventloop %s", eventloop) try: - foo eventloop(self) except KeyboardInterrupt: # Ctrl-C shouldn't crash the kernel diff --git a/ipykernel/tests/test_kernel_direct.py b/ipykernel/tests/test_kernel_direct.py index b0a09a860..f75d8b6d7 100644 --- a/ipykernel/tests/test_kernel_direct.py +++ b/ipykernel/tests/test_kernel_direct.py @@ -132,27 +132,6 @@ def __init__(self, bytes): await kernel.dispatch_shell(msg) -async def test_enter_eventloop(kernel): - kernel.eventloop = None - kernel.enter_eventloop() - kernel.eventloop = asyncio.get_running_loop() - kernel.enter_eventloop() - called = 0 - - def check_status(): - nonlocal called - if called == 0: - msg = kernel.session.msg("debug_request", {}) - kernel.msg_queue.put(msg) - called += 1 - kernel.io_loop.call_later(0.001, check_status) - - kernel.io_loop.call_later(0.001, check_status) - kernel.start() - while called < 2: - await asyncio.sleep(0.1) - - async def test_do_one_iteration(kernel): kernel.msg_queue = asyncio.Queue() await kernel.do_one_iteration()