|
257 | 257 |
|
258 | 258 | ;;; Server |
259 | 259 |
|
260 | | -;; And `jupyter-server-kernel-comm' |
261 | 260 | (ert-deftest jupyter-server () |
262 | 261 | :tags '(server) |
| 262 | + (let ((jupyter-server-use-zmq nil)) |
| 263 | + (jupyter-test-with-notebook server |
| 264 | + (jupyter-test-with-server-kernel server "python" kernel |
| 265 | + (ert-info ("`jupyter-comm-layer' methods") |
| 266 | + (let ((kcomm (jupyter-server-kernel-comm :kernel kernel))) |
| 267 | + (should-not (jupyter-comm-alive-p kcomm)) |
| 268 | + (jupyter-comm-start kcomm) |
| 269 | + (should (jupyter-comm-alive-p kcomm)) |
| 270 | + (jupyter-comm-stop kcomm) |
| 271 | + (should-not (jupyter-comm-alive-p kcomm)))) |
| 272 | + (ert-info ("Sending/receiving") |
| 273 | + (let ((client (jupyter-kernel-client))) |
| 274 | + (oset client kcomm (jupyter-server-kernel-comm :kernel kernel)) |
| 275 | + (jupyter-start-channels client) |
| 276 | + (should (json-plist-p (jupyter-kernel-info client))) |
| 277 | + (jupyter-stop-channels client))))))) |
| 278 | + |
| 279 | +;; And `jupyter-server-ioloop-kernel-comm' |
| 280 | +(ert-deftest jupyter-server-ioloop-comm () |
| 281 | + :tags '(server) |
| 282 | + (skip-unless jupyter-server-use-zmq) |
263 | 283 | (jupyter-test-with-notebook server |
264 | 284 | (ert-info ("`jupyter-comm-layer' methods") |
265 | 285 | (when (jupyter-comm-alive-p server) |
|
272 | 292 | (let ((id (oref kernel id))) |
273 | 293 | (should (jupyter-api-get-kernel server id)) |
274 | 294 | (ert-info ("Connecting kernel comm to server") |
275 | | - (let ((kcomm (jupyter-server-kernel-comm |
| 295 | + (let ((kcomm (jupyter-server-ioloop-kernel-comm |
276 | 296 | :kernel kernel))) |
277 | 297 | (should-not (jupyter-server-kernel-connected-p server id)) |
278 | 298 | (jupyter-comm-add-handler server kcomm) |
|
282 | 302 | (should-not (jupyter-comm-alive-p kcomm)) |
283 | 303 | (should (jupyter-comm-alive-p server)))) |
284 | 304 | (ert-info ("Connecting kernel comm starts server comm if necessary") |
285 | | - (let ((kcomm (jupyter-server-kernel-comm |
| 305 | + (let ((kcomm (jupyter-server-ioloop-kernel-comm |
286 | 306 | :kernel kernel))) |
287 | 307 | (jupyter-comm-stop server) |
288 | 308 | (should-not (jupyter-comm-alive-p server)) |
|
0 commit comments