[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2c82530f47 3/7: ; Allow ignoring errors when calling 'eshell-matc
From: |
Jim Porter |
Subject: |
master 2c82530f47 3/7: ; Allow ignoring errors when calling 'eshell-match-command-output' |
Date: |
Mon, 17 Oct 2022 21:49:46 -0400 (EDT) |
branch: master
commit 2c82530f475c71d90284b2b90980475f73f16a8b
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>
; Allow ignoring errors when calling 'eshell-match-command-output'
* test/lisp/eshell/eshell-tests-helpers.el
(eshell-match-command-output): New argument IGNORE-ERRORS.
* test/lisp/eshell/esh-var-tests.el
(esh-var-test/last-status-var-lisp-command)
(esh-var-test/last-status-var-lisp-form)
(esh-var-test/last-status-var-lisp-form-2): Ignore errors when calling
'eshell-match-command-output'.
---
test/lisp/eshell/esh-var-tests.el | 15 ++++++---------
test/lisp/eshell/eshell-tests-helpers.el | 13 ++++++++++---
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/test/lisp/eshell/esh-var-tests.el
b/test/lisp/eshell/esh-var-tests.el
index cb5b1766bb..ad695e45d7 100644
--- a/test/lisp/eshell/esh-var-tests.el
+++ b/test/lisp/eshell/esh-var-tests.el
@@ -472,9 +472,8 @@ inside double-quotes"
"t\n0\n")
(eshell-match-command-output "zerop 1; echo $?"
"0\n")
- (let ((debug-on-error nil))
- (eshell-match-command-output "zerop foo; echo $?"
- "1\n"))))
+ (eshell-match-command-output "zerop foo; echo $?"
+ "1\n" nil t)))
(ert-deftest esh-var-test/last-status-var-lisp-form ()
"Test using the \"last exit status\" ($?) variable with a Lisp form"
@@ -484,9 +483,8 @@ inside double-quotes"
"t\n0\n")
(eshell-match-command-output "(zerop 1); echo $?"
"2\n")
- (let ((debug-on-error nil))
- (eshell-match-command-output "(zerop \"foo\"); echo $?"
- "1\n")))))
+ (eshell-match-command-output "(zerop \"foo\"); echo $?"
+ "1\n" nil t))))
(ert-deftest esh-var-test/last-status-var-lisp-form-2 ()
"Test using the \"last exit status\" ($?) variable with a Lisp form.
@@ -497,9 +495,8 @@ This tests when `eshell-lisp-form-nil-is-failure' is nil."
"0\n")
(eshell-match-command-output "(zerop 0); echo $?"
"0\n")
- (let ((debug-on-error nil))
- (eshell-match-command-output "(zerop \"foo\"); echo $?"
- "1\n")))))
+ (eshell-match-command-output "(zerop \"foo\"); echo $?"
+ "1\n" nil t))))
(ert-deftest esh-var-test/last-status-var-ext-cmd ()
"Test using the \"last exit status\" ($?) variable with an external command"
diff --git a/test/lisp/eshell/eshell-tests-helpers.el
b/test/lisp/eshell/eshell-tests-helpers.el
index 73abfcbb55..e713e162ad 100644
--- a/test/lisp/eshell/eshell-tests-helpers.el
+++ b/test/lisp/eshell/eshell-tests-helpers.el
@@ -100,9 +100,16 @@ After inserting, call FUNC. If FUNC is nil, instead call
(put 'eshell-match-output 'ert-explainer #'eshell-match-output--explainer)
-(defun eshell-match-command-output (command regexp &optional func)
- "Insert a COMMAND at the end of the buffer and match the output with REGEXP."
- (eshell-insert-command command func)
+(defun eshell-match-command-output (command regexp &optional func
+ ignore-errors)
+ "Insert a COMMAND at the end of the buffer and match the output with REGEXP.
+FUNC is the function to call after inserting the text (see
+`eshell-insert-command').
+
+If IGNORE-ERRORS is non-nil, ignore any errors signaled when
+inserting the command."
+ (let ((debug-on-error (and (not ignore-errors) debug-on-error)))
+ (eshell-insert-command command func))
(eshell-wait-for-subprocess)
(should (eshell-match-output regexp)))
- master updated (f4442d49f6 -> fd4992d356), Jim Porter, 2022/10/17
- master 1beb389e47 1/7: ; Remove over-quoting of :application values in connection-local variables, Jim Porter, 2022/10/17
- master 2c82530f47 3/7: ; Allow ignoring errors when calling 'eshell-match-command-output',
Jim Porter <=
- master cee1cbfd54 6/7: Improve handling of $PATH in Eshell for remote directories, Jim Porter, 2022/10/17
- master 7c41016fca 5/7: Allow setting the values of variable aliases in Eshell, Jim Porter, 2022/10/17
- master f1caa10f04 4/7: ; Obsolete 'eshell/define', Jim Porter, 2022/10/17
- master 3cc356abfe 2/7: Add helpers to dynamically assign connection-local values, Jim Porter, 2022/10/17
- master fd4992d356 7/7: Print the correct $PATH when Eshell's 'which' fails to find a command, Jim Porter, 2022/10/17