diff options
| author | Reuben Thomas | 2017-09-01 23:38:31 +0100 |
|---|---|---|
| committer | Reuben Thomas | 2017-09-01 23:41:15 +0100 |
| commit | 6c995e4194d016fa8959acffd5787da4d3032f05 (patch) | |
| tree | efe83bf22439da54f42ce8be81ef0bb487733a8d /test/lib-src | |
| parent | cae005f28d8533aeb76ccb18601158ea959bc807 (diff) | |
| download | emacs-6c995e4194d016fa8959acffd5787da4d3032f05.tar.gz emacs-6c995e4194d016fa8959acffd5787da4d3032f05.zip | |
Fix a mis-binding and a bad defun name in a test (Bug#28319)
test/lib-src/emacs-client-tests.el (call-emacsclient): Rename
emacsclient-test-call-emacsclient.
(emacsclient-test-alternate-editor-allows-arguments)
(emacsclient-test-alternate-editor-allows-quotes): Fix let-binding of
process-environment.
Thanks to Glenn Morris for noticing these errors.
Diffstat (limited to 'test/lib-src')
| -rw-r--r-- | test/lib-src/emacsclient-tests.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el index e454e2825e6..91f1f1002d5 100644 --- a/test/lib-src/emacsclient-tests.el +++ b/test/lib-src/emacsclient-tests.el | |||
| @@ -31,26 +31,26 @@ | |||
| 31 | "lib-src")) | 31 | "lib-src")) |
| 32 | "Path to emacsclient binary in build tree.") | 32 | "Path to emacsclient binary in build tree.") |
| 33 | 33 | ||
| 34 | (defun call-emacsclient () | 34 | (defun emacsclient-test-call-emacsclient () |
| 35 | "Run emacsclient." | 35 | "Run emacsclient." |
| 36 | (call-process emacsclient-test-emacs nil nil nil | 36 | (call-process emacsclient-test-emacs nil nil nil |
| 37 | "--server-file" (expand-file-name "non-existent-file" invocation-directory) | 37 | "--server-file" (expand-file-name "non-existent-file" invocation-directory) |
| 38 | "foo")) | 38 | "foo")) |
| 39 | 39 | ||
| 40 | (ert-deftest emacsclient-test-alternate-editor-allows-arguments () | 40 | (ert-deftest emacsclient-test-alternate-editor-allows-arguments () |
| 41 | (let (process-environment process-environment) | 41 | (let ((process-environment process-environment)) |
| 42 | (setenv "ALTERNATE_EDITOR" (concat | 42 | (setenv "ALTERNATE_EDITOR" (concat |
| 43 | (expand-file-name invocation-name invocation-directory) | 43 | (expand-file-name invocation-name invocation-directory) |
| 44 | " --batch")) | 44 | " --batch")) |
| 45 | (should (= 0 (call-emacsclient))))) | 45 | (should (= 0 (emacsclient-test-call-emacsclient))))) |
| 46 | 46 | ||
| 47 | (ert-deftest emacsclient-test-alternate-editor-allows-quotes () | 47 | (ert-deftest emacsclient-test-alternate-editor-allows-quotes () |
| 48 | (let (process-environment process-environment) | 48 | (let ((process-environment process-environment)) |
| 49 | (setenv "ALTERNATE_EDITOR" (concat | 49 | (setenv "ALTERNATE_EDITOR" (concat |
| 50 | "\"" | 50 | "\"" |
| 51 | (expand-file-name invocation-name invocation-directory) | 51 | (expand-file-name invocation-name invocation-directory) |
| 52 | "\"" " --batch")) | 52 | "\"" " --batch")) |
| 53 | (should (= 0 (call-emacsclient))))) | 53 | (should (= 0 (emacsclient-test-call-emacsclient))))) |
| 54 | 54 | ||
| 55 | (provide 'emacsclient-tests) | 55 | (provide 'emacsclient-tests) |
| 56 | ;;; emacsclient-tests.el ends here | 56 | ;;; emacsclient-tests.el ends here |