From 591d51c9bcef214644016dc7097e00d5d53f77fe Mon Sep 17 00:00:00 2001 From: Nathaniel Nicandro Date: Fri, 17 Apr 2020 16:35:39 -0500 Subject: [PATCH] `jupyter-api-get-kernel-ws` -> `jupyter-api-kernel-websocket` * jupyter-rest-api.el: Do it. * test/jupyter-server-test.el: Do it. --- jupyter-rest-api.el | 2 +- jupyter-server-ioloop.el | 2 +- test/jupyter-server-test.el | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jupyter-rest-api.el b/jupyter-rest-api.el index 17a25b8..87a3b7b 100644 --- a/jupyter-rest-api.el +++ b/jupyter-rest-api.el @@ -815,7 +815,7 @@ request." ;;;; Kernel websocket -(defun jupyter-api-get-kernel-ws (client id &rest plist) +(defun jupyter-api-kernel-websocket (client id &rest plist) "Return a websocket using CLIENT's ws-url slot. ID identifies the kernel to connect to, PLIST will be passed to the call to `websocket-open' to initialize the websocket. diff --git a/jupyter-server-ioloop.el b/jupyter-server-ioloop.el index 99cff34..b77d1cf 100644 --- a/jupyter-server-ioloop.el +++ b/jupyter-server-ioloop.el @@ -163,7 +163,7 @@ websocket.") (cl-callf2 delq ws jupyter-server-connected-kernels)) (defun jupyter-server-ioloop--connect (kernel-id) - (let ((ws (jupyter-api-get-kernel-ws + (let ((ws (jupyter-api-kernel-websocket jupyter-server-rest-client kernel-id :on-error #'jupyter-server-ioloop--on-error :on-message #'jupyter-server-ioloop--on-message))) diff --git a/test/jupyter-server-test.el b/test/jupyter-server-test.el index 9cbe07e..d230fea 100644 --- a/test/jupyter-server-test.el +++ b/test/jupyter-server-test.el @@ -184,14 +184,14 @@ (should cookies-copied-before-write) (should cookies-written))) -(ert-deftest jupyter-api-get-kernel-ws () +(ert-deftest jupyter-api-kernel-websocket () :tags '(rest) (jupyter-test-rest-api-with-notebook client (cl-destructuring-bind (&key id &allow-other-keys) (jupyter-api-start-kernel client) (unwind-protect (let ((kernel-id id) - (ws (jupyter-api-get-kernel-ws client id))) + (ws (jupyter-api-kernel-websocket client id))) (unwind-protect (cl-destructuring-bind (&key id session &allow-other-keys) (websocket-client-data ws)