diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2012-02-13 13:45:36 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2012-02-13 13:45:36 -0500 |
| commit | 6c0c7cfc6755342c15e0230747d7f0c697c899d9 (patch) | |
| tree | 7e508c62ef01da5ec4889dedf260a1e861c0c616 /lisp/url | |
| parent | c14fcc95713913de0fa9d84e3ed502bcb0b07c38 (diff) | |
| download | emacs-6c0c7cfc6755342c15e0230747d7f0c697c899d9.tar.gz | |
Move url-future.el ERT test to test/automated/url-future-tests.el.
* lisp/url/url-future.el (url-future-test): Move to test/automated.
* test/automated/url-future-tests.el (url-future-tests): Move from
lisp/url/url-future.el and rename.
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/url/url-future.el | 27 |
2 files changed, 4 insertions, 27 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 4f49adcd932..0340c954aea 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2012-02-13 Teodor Zlatanov <tzz@lifelogs.com> + + * url-future.el (url-future-test): Move to test/automated. + 2012-02-10 Lars Ingebrigtsen <larsi@gnus.org> * url-http.el (url-http-parse-headers): When redirecting, pass on diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index 2798f936f21..f35399469c8 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -95,32 +95,5 @@ (signal 'error 'url-future-already-done) (url-future-finish url-future 'cancel))) -(ert-deftest url-future-test () - (let* (saver - (text "running future") - (good (make-url-future :value (lambda () (format text)) - :callback (lambda (f) (set 'saver f)))) - (bad (make-url-future :value (lambda () (/ 1 0)) - :errorback (lambda (&rest d) (set 'saver d)))) - (tocancel (make-url-future :value (lambda () (/ 1 0)) - :callback (lambda (f) (set 'saver f)) - :errorback (lambda (&rest d) - (set 'saver d))))) - (should (equal good (url-future-call good))) - (should (equal good saver)) - (should (equal text (url-future-value good))) - (should (url-future-completed-p good)) - (should-error (url-future-call good)) - (setq saver nil) - (should (equal bad (url-future-call bad))) - (should-error (url-future-call bad)) - (should (equal saver (list bad '(arith-error)))) - (should (url-future-errored-p bad)) - (setq saver nil) - (should (equal (url-future-cancel tocancel) tocancel)) - (should-error (url-future-call tocancel)) - (should (null saver)) - (should (url-future-cancelled-p tocancel)))) - (provide 'url-future) ;;; url-future.el ends here |