From c89c359906f1ae54c541c8009b452f044d787679 Mon Sep 17 00:00:00 2001 From: Kevin Bates Date: Sun, 17 Jan 2021 09:28:44 -0800 Subject: [PATCH] Increase culling test idle timeout --- .../services/kernels/tests/test_kernels_api.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/notebook/services/kernels/tests/test_kernels_api.py b/notebook/services/kernels/tests/test_kernels_api.py index 36c441c2c7..010ca63346 100644 --- a/notebook/services/kernels/tests/test_kernels_api.py +++ b/notebook/services/kernels/tests/test_kernels_api.py @@ -237,6 +237,10 @@ def test_config(self): self.assertEqual(self.notebook.kernel_manager.allowed_message_types, ['kernel_info_request']) +CULL_TIMEOUT = 5 +CULL_INTERVAL = 1 + + class KernelCullingTest(NotebookTestBase): """Test kernel culling """ @@ -244,9 +248,9 @@ class KernelCullingTest(NotebookTestBase): def get_argv(cls): argv = super(KernelCullingTest, cls).get_argv() - # Enable culling with 2s timeout and 1s intervals - argv.extend(['--MappingKernelManager.cull_idle_timeout=2', - '--MappingKernelManager.cull_interval=1', + # Enable culling with 5s timeout and 1s intervals + argv.extend(['--MappingKernelManager.cull_idle_timeout={}'.format(CULL_TIMEOUT), + '--MappingKernelManager.cull_interval={}'.format(CULL_INTERVAL), '--MappingKernelManager.cull_connected=False']) return argv @@ -270,8 +274,9 @@ def test_culling(self): assert self.get_cull_status(kid) # not connected, should be culled def get_cull_status(self, kid): + frequency = 0.5 culled = False - for i in range(15): # Need max of 3s to ensure culling timeout exceeded + for _ in range(int((CULL_TIMEOUT + CULL_INTERVAL)/frequency)): # Timeout + Interval will ensure cull try: self.kern_api.get(kid) except HTTPError as e: @@ -279,5 +284,5 @@ def get_cull_status(self, kid): culled = True break else: - time.sleep(0.2) + time.sleep(frequency) return culled