aboutsummaryrefslogtreecommitdiffstats
path: root/test/lib-src
diff options
context:
space:
mode:
authorGlenn Morris2017-09-03 10:55:45 -0700
committerGlenn Morris2017-09-03 10:56:18 -0700
commit48116f91267cb35cdde0a1558c7cee47b6e3ff53 (patch)
treebf6948203b01a71fbd7422224a05b8710cbd57a7 /test/lib-src
parent96c23a19fdcedad917109767b036104db7320f69 (diff)
downloademacs-48116f91267cb35cdde0a1558c7cee47b6e3ff53.tar.gz
emacs-48116f91267cb35cdde0a1558c7cee47b6e3ff53.zip
emacsclient-tests: call-process may return non-integer
* test/lib-src/emacsclient-tests.el (emacsclient-test-alternate-editor-allows-arguments) (emacsclient-test-alternate-editor-allows-quotes): Handle non-integer return from call-process.
Diffstat (limited to 'test/lib-src')
-rw-r--r--test/lib-src/emacsclient-tests.el14
1 files changed, 8 insertions, 6 deletions
diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el
index 91f1f1002d5..61ead4f0f32 100644
--- a/test/lib-src/emacsclient-tests.el
+++ b/test/lib-src/emacsclient-tests.el
@@ -1,19 +1,21 @@
1;;; emacsclient-tests.el --- Test emacsclient 1;;; emacsclient-tests.el --- Test emacsclient
2 2
3;; Copyright (C) 2016 Free Software Foundation, Inc. 3;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
4 4
5;; This program is free software; you can redistribute it and/or modify 5;; This file is part of GNU Emacs.
6
7;; GNU Emacs is free software: you can redistribute it and/or modify
6;; it under the terms of the GNU General Public License as published by 8;; it under the terms of the GNU General Public License as published by
7;; the Free Software Foundation, either version 3 of the License, or 9;; the Free Software Foundation, either version 3 of the License, or
8;; (at your option) any later version. 10;; (at your option) any later version.
9 11
10;; This program is distributed in the hope that it will be useful, 12;; GNU Emacs is distributed in the hope that it will be useful,
11;; but WITHOUT ANY WARRANTY; without even the implied warranty of 13;; but WITHOUT ANY WARRANTY; without even the implied warranty of
12;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13;; GNU General Public License for more details. 15;; GNU General Public License for more details.
14 16
15;; You should have received a copy of the GNU General Public License 17;; You should have received a copy of the GNU General Public License
16;; along with this program. If not, see <http://www.gnu.org/licenses/>. 18;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
17 19
18;;; Commentary: 20;;; Commentary:
19 21
@@ -42,7 +44,7 @@
42 (setenv "ALTERNATE_EDITOR" (concat 44 (setenv "ALTERNATE_EDITOR" (concat
43 (expand-file-name invocation-name invocation-directory) 45 (expand-file-name invocation-name invocation-directory)
44 " --batch")) 46 " --batch"))
45 (should (= 0 (emacsclient-test-call-emacsclient))))) 47 (should (eq 0 (emacsclient-test-call-emacsclient)))))
46 48
47(ert-deftest emacsclient-test-alternate-editor-allows-quotes () 49(ert-deftest emacsclient-test-alternate-editor-allows-quotes ()
48 (let ((process-environment process-environment)) 50 (let ((process-environment process-environment))
@@ -50,7 +52,7 @@
50 "\"" 52 "\""
51 (expand-file-name invocation-name invocation-directory) 53 (expand-file-name invocation-name invocation-directory)
52 "\"" " --batch")) 54 "\"" " --batch"))
53 (should (= 0 (emacsclient-test-call-emacsclient))))) 55 (should (eq 0 (emacsclient-test-call-emacsclient)))))
54 56
55(provide 'emacsclient-tests) 57(provide 'emacsclient-tests)
56;;; emacsclient-tests.el ends here 58;;; emacsclient-tests.el ends here