diff --git a/sparkmagic/sparkmagic/serverextension/handlers.py b/sparkmagic/sparkmagic/serverextension/handlers.py index c94a258ca..0afd7a124 100644 --- a/sparkmagic/sparkmagic/serverextension/handlers.py +++ b/sparkmagic/sparkmagic/serverextension/handlers.py @@ -94,9 +94,13 @@ def _get_argument_or_raise(self, data, key): except KeyError: raise MissingArgumentError(key) + def _get_list_sessions(self): + sessions = self.session_manager.list_sessions() + return [session for session in sessions.result] + @gen.coroutine def _get_kernel_manager(self, path, kernel_name): - sessions = self.session_manager.list_sessions() + sessions = self._get_list_sessions() kernel_id = None for session in sessions: diff --git a/sparkmagic/sparkmagic/tests/test_handlers.py b/sparkmagic/sparkmagic/tests/test_handlers.py index 4d01734fd..fef95c957 100644 --- a/sparkmagic/sparkmagic/tests/test_handlers.py +++ b/sparkmagic/sparkmagic/tests/test_handlers.py @@ -53,7 +53,7 @@ def setUp(self): self.kernel_manager.get_kernel = MagicMock(return_value=self.individual_kernel_manager) # Mock session manager - self.session_list = [self.create_session_dict(self.path, self.kernel_id)] + self.session_list = MagicMock(return_value=[self.create_session_dict(self.path, self.kernel_id)]) self.session_manager = MagicMock() self.session_manager.list_sessions = MagicMock(return_value=self.session_list) self.session_manager.create_session = MagicMock(return_value=self.create_session_dict(self.path, self.kernel_id)) @@ -68,6 +68,7 @@ def setUp(self): # Create mocked reconnect_handler ReconnectHandler.__bases__ = (SimpleObject,) self.reconnect_handler = ReconnectHandler() + self.reconnect_handler._get_list_sessions = self.session_list self.reconnect_handler.spark_events = self.spark_events self.reconnect_handler.session_manager = self.session_manager self.reconnect_handler.kernel_manager = self.kernel_manager