From 085fd73823a9d964362e45b60dfd8f38f885f25e Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Tue, 22 May 2012 23:32:47 +0200 Subject: [PATCH] Fix test-ein-kernel.el: these tests are passed --- tests/test-ein-kernel.el | 53 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/tests/test-ein-kernel.el b/tests/test-ein-kernel.el index 003698d..7464601 100644 --- a/tests/test-ein-kernel.el +++ b/tests/test-ein-kernel.el @@ -4,62 +4,59 @@ (require 'ein-kernel) +(defun eintest:kernel-new (port) + (ein:kernel-new port "/kernels" + (get-buffer-create "*eintest: dummy for kernel test*"))) + (ert-deftest ein:kernel-start-check-url () - (let* ((port 8888) - (kernel (ein:kernel-new 8888)) + (let* ((kernel (eintest:kernel-new 8888)) (notebook-id "NOTEBOOK-ID") (desired-url "http://127.0.0.1:8888/kernels?notebook=NOTEBOOK-ID") got-url) (flet ((url-retrieve (url &rest ignore) (setq got-url url))) - (ein:kernel-start kernel notebook-id nil) + (ein:kernel-start kernel notebook-id) (should (equal got-url desired-url))))) (ert-deftest ein:kernel-restart-check-url () - (let* ((port 8888) - (kernel (ein:kernel-new 8888)) + (let* ((kernel (eintest:kernel-new 8888)) (kernel-id "KERNEL-ID") (desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID/restart") got-url) (flet ((url-retrieve (url &rest ignore) (setq got-url url)) - (ein:kernel-start-channels (&rest ignore)) - (ein:kernel-stop-channels (&rest ignore))) - (ein:kernel--handle-start-kernel - kernel - (list :kernel_id kernel-id) - (lambda ())) - (ein:kernel-restart kernel nil) + (websocket-open (&rest ignore)) + (websocket-close (&rest ignore)) + (run-at-time (&rest ignore)) + (ein:events-trigger (&rest ignore))) + (ein:kernel--kernel-started kernel (list :kernel_id kernel-id)) + (ein:kernel-restart kernel) (should (equal got-url desired-url))))) (ert-deftest ein:kernel-interrupt-check-url () - (let* ((port 8888) - (kernel (ein:kernel-new 8888)) + (let* ((kernel (eintest:kernel-new 8888)) (kernel-id "KERNEL-ID") (desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID/interrupt") got-url) (flet ((url-retrieve (url &rest ignore) (setq got-url url)) - (ein:kernel-start-channels (&rest ignore)) - (ein:kernel-stop-channels (&rest ignore))) - (ein:kernel--handle-start-kernel - kernel - (list :kernel_id kernel-id) - (lambda ())) + (websocket-open (&rest ignore)) + (websocket-close (&rest ignore)) + (run-at-time (&rest ignore)) + (ein:events-trigger (&rest ignore))) + (ein:kernel--kernel-started kernel (list :kernel_id kernel-id)) (ein:kernel-interrupt kernel) (should (equal got-url desired-url))))) (ert-deftest ein:kernel-kill-check-url () - (let* ((port 8888) - (kernel (ein:kernel-new 8888)) + (let* ((kernel (eintest:kernel-new 8888)) (kernel-id "KERNEL-ID") (desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID") got-url) (flet ((url-retrieve (url &rest ignore) (setq got-url url)) - (ein:kernel-start-channels (&rest ignore)) - (ein:kernel-stop-channels (&rest ignore))) - (ein:kernel--handle-start-kernel - kernel - (list :kernel_id kernel-id) - (lambda ())) + (websocket-open (&rest ignore)) + (websocket-close (&rest ignore)) + (run-at-time (&rest ignore)) + (ein:events-trigger (&rest ignore))) + (ein:kernel--kernel-started kernel (list :kernel_id kernel-id)) (ein:kernel-kill kernel) (let* ((l (split-string got-url "?")) (got-url-0 (nth 0 l))