Fix test-ein-kernel.el: these tests are passed

This commit is contained in:
Takafumi Arakaki 2012-05-22 23:32:47 +02:00
parent 18c7c027ff
commit 085fd73823

View file

@ -4,62 +4,59 @@
(require 'ein-kernel) (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 () (ert-deftest ein:kernel-start-check-url ()
(let* ((port 8888) (let* ((kernel (eintest:kernel-new 8888))
(kernel (ein:kernel-new 8888))
(notebook-id "NOTEBOOK-ID") (notebook-id "NOTEBOOK-ID")
(desired-url "http://127.0.0.1:8888/kernels?notebook=NOTEBOOK-ID") (desired-url "http://127.0.0.1:8888/kernels?notebook=NOTEBOOK-ID")
got-url) got-url)
(flet ((url-retrieve (url &rest ignore) (setq got-url 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))))) (should (equal got-url desired-url)))))
(ert-deftest ein:kernel-restart-check-url () (ert-deftest ein:kernel-restart-check-url ()
(let* ((port 8888) (let* ((kernel (eintest:kernel-new 8888))
(kernel (ein:kernel-new 8888))
(kernel-id "KERNEL-ID") (kernel-id "KERNEL-ID")
(desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID/restart") (desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID/restart")
got-url) got-url)
(flet ((url-retrieve (url &rest ignore) (setq got-url url)) (flet ((url-retrieve (url &rest ignore) (setq got-url url))
(ein:kernel-start-channels (&rest ignore)) (websocket-open (&rest ignore))
(ein:kernel-stop-channels (&rest ignore))) (websocket-close (&rest ignore))
(ein:kernel--handle-start-kernel (run-at-time (&rest ignore))
kernel (ein:events-trigger (&rest ignore)))
(list :kernel_id kernel-id) (ein:kernel--kernel-started kernel (list :kernel_id kernel-id))
(lambda ())) (ein:kernel-restart kernel)
(ein:kernel-restart kernel nil)
(should (equal got-url desired-url))))) (should (equal got-url desired-url)))))
(ert-deftest ein:kernel-interrupt-check-url () (ert-deftest ein:kernel-interrupt-check-url ()
(let* ((port 8888) (let* ((kernel (eintest:kernel-new 8888))
(kernel (ein:kernel-new 8888))
(kernel-id "KERNEL-ID") (kernel-id "KERNEL-ID")
(desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID/interrupt") (desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID/interrupt")
got-url) got-url)
(flet ((url-retrieve (url &rest ignore) (setq got-url url)) (flet ((url-retrieve (url &rest ignore) (setq got-url url))
(ein:kernel-start-channels (&rest ignore)) (websocket-open (&rest ignore))
(ein:kernel-stop-channels (&rest ignore))) (websocket-close (&rest ignore))
(ein:kernel--handle-start-kernel (run-at-time (&rest ignore))
kernel (ein:events-trigger (&rest ignore)))
(list :kernel_id kernel-id) (ein:kernel--kernel-started kernel (list :kernel_id kernel-id))
(lambda ()))
(ein:kernel-interrupt kernel) (ein:kernel-interrupt kernel)
(should (equal got-url desired-url))))) (should (equal got-url desired-url)))))
(ert-deftest ein:kernel-kill-check-url () (ert-deftest ein:kernel-kill-check-url ()
(let* ((port 8888) (let* ((kernel (eintest:kernel-new 8888))
(kernel (ein:kernel-new 8888))
(kernel-id "KERNEL-ID") (kernel-id "KERNEL-ID")
(desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID") (desired-url "http://127.0.0.1:8888/kernels/KERNEL-ID")
got-url) got-url)
(flet ((url-retrieve (url &rest ignore) (setq got-url url)) (flet ((url-retrieve (url &rest ignore) (setq got-url url))
(ein:kernel-start-channels (&rest ignore)) (websocket-open (&rest ignore))
(ein:kernel-stop-channels (&rest ignore))) (websocket-close (&rest ignore))
(ein:kernel--handle-start-kernel (run-at-time (&rest ignore))
kernel (ein:events-trigger (&rest ignore)))
(list :kernel_id kernel-id) (ein:kernel--kernel-started kernel (list :kernel_id kernel-id))
(lambda ()))
(ein:kernel-kill kernel) (ein:kernel-kill kernel)
(let* ((l (split-string got-url "?")) (let* ((l (split-string got-url "?"))
(got-url-0 (nth 0 l)) (got-url-0 (nth 0 l))