summaryrefslogtreecommitdiff
path: root/test/lisp/eshell/em-script-tests.el
diff options
context:
space:
mode:
authorJim Porter <jporterbugs@gmail.com>2022-08-13 20:31:11 -0700
committerJim Porter <jporterbugs@gmail.com>2022-08-15 20:40:27 -0700
commit07b8fb197a3057a3419be0335236547e4d7a326b (patch)
tree52b631c5f3cc6370223e1d9f7920b7b3af37f197 /test/lisp/eshell/em-script-tests.el
parent1973d4ac1b613bdd6c70e1ef2bac97b538fbb2ed (diff)
downloademacs-07b8fb197a3057a3419be0335236547e4d7a326b.tar.gz
emacs-07b8fb197a3057a3419be0335236547e4d7a326b.tar.bz2
emacs-07b8fb197a3057a3419be0335236547e4d7a326b.zip
Provide ERT explainer for 'eshell-match-command-output'
This was formerly named 'eshell-command-result-p', but "result" isn't quite the right terminology, since this function specifically tested the output of a command, not its Lisp result (as 'eshell-command-result' would return). * test/lisp/eshell/eshell-tests-helpers.el (eshell-insert-command): Provide a more-complete docstring. (eshell-match-result): Rename to... (eshell-match-output): ... this. (eshell-match-output--explainer): New function. (eshell-command-result-p): Rename to... (eshell-match-command-output): ... this. * test/lisp/eshell/em-alias-tests.el * test/lisp/eshell/em-dirs-tests.el * test/lisp/eshell/em-extpipe-tests.el * test/lisp/eshell/em-script-tests.el * test/lisp/eshell/esh-cmd-tests.el * test/lisp/eshell/esh-proc-tests.el * test/lisp/eshell/esh-var-tests.el * test/lisp/eshell/eshell-tests-helpers.el * test/lisp/eshell/eshell-tests.el: Use 'eshell-match-command-output'.
Diffstat (limited to 'test/lisp/eshell/em-script-tests.el')
-rw-r--r--test/lisp/eshell/em-script-tests.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/lisp/eshell/em-script-tests.el b/test/lisp/eshell/em-script-tests.el
index a34f9434021..b837d464ccd 100644
--- a/test/lisp/eshell/em-script-tests.el
+++ b/test/lisp/eshell/em-script-tests.el
@@ -38,25 +38,25 @@
"Test sourcing script with no argumentss"
(ert-with-temp-file temp-file :text "echo hi"
(with-temp-eshell
- (eshell-command-result-p (format "source %s" temp-file)
- "hi\n"))))
+ (eshell-match-command-output (format "source %s" temp-file)
+ "hi\n"))))
(ert-deftest em-script-test/source-script-arg-vars ()
"Test sourcing script with $0, $1, ... variables"
(ert-with-temp-file temp-file :text "printnl $0 \"$1 $2\""
(with-temp-eshell
- (eshell-command-result-p (format "source %s one two" temp-file)
- (format "%s\none two\n" temp-file)))))
+ (eshell-match-command-output (format "source %s one two" temp-file)
+ (format "%s\none two\n" temp-file)))))
(ert-deftest em-script-test/source-script-all-args-var ()
"Test sourcing script with the $* variable"
(ert-with-temp-file temp-file :text "printnl $*"
(with-temp-eshell
- (eshell-command-result-p (format "source %s" temp-file)
- "\\`\\'")
- (eshell-command-result-p (format "source %s a" temp-file)
- "a\n")
- (eshell-command-result-p (format "source %s a b c" temp-file)
- "a\nb\nc\n"))))
+ (eshell-match-command-output (format "source %s" temp-file)
+ "\\`\\'")
+ (eshell-match-command-output (format "source %s a" temp-file)
+ "a\n")
+ (eshell-match-command-output (format "source %s a b c" temp-file)
+ "a\nb\nc\n"))))
;; em-script-tests.el ends here