diff options
| author | Jim Porter | 2022-08-31 09:47:43 -0700 |
|---|---|---|
| committer | Jim Porter | 2022-08-31 13:47:58 -0700 |
| commit | 612ff133b7720de3a551b433eb8705a6a2bbc037 (patch) | |
| tree | 851b8554b0600d43e0dd0fe48dd57ae2082f8b45 /test | |
| parent | 71b7ad0cf7dc85b786ba225ff84f842459ba4581 (diff) | |
| download | emacs-612ff133b7720de3a551b433eb8705a6a2bbc037.tar.gz emacs-612ff133b7720de3a551b433eb8705a6a2bbc037.zip | |
Don't fail Eshell ERT tests when an internal signal gets raised
* test/lisp/eshell/esh-proc-tests.el
(esh-proc-test/pipeline-connection-type/middle)
(esh-proc-test/pipeline-connection-type/last): Set 'debug-on-error' to
nil.
Ref: https://lists.gnu.org/archive/html/emacs-devel/2022-08/msg01452.html
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/eshell/esh-proc-tests.el | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el index 2369bb5cc00..b9f4470be6b 100644 --- a/test/lisp/eshell/esh-proc-tests.el +++ b/test/lisp/eshell/esh-proc-tests.el | |||
| @@ -76,17 +76,23 @@ | |||
| 76 | pipeline." | 76 | pipeline." |
| 77 | (skip-unless (and (executable-find "sh") | 77 | (skip-unless (and (executable-find "sh") |
| 78 | (executable-find "cat"))) | 78 | (executable-find "cat"))) |
| 79 | (eshell-command-result-equal | 79 | ;; An `eshell-pipe-broken' signal might occur internally; let Eshell |
| 80 | (concat "echo | " esh-proc-test--detect-pty-cmd " | cat") | 80 | ;; handle it! |
| 81 | nil)) | 81 | (let ((debug-on-error nil)) |
| 82 | (eshell-command-result-equal | ||
| 83 | (concat "echo hi | " esh-proc-test--detect-pty-cmd " | cat") | ||
| 84 | nil))) | ||
| 82 | 85 | ||
| 83 | (ert-deftest esh-proc-test/pipeline-connection-type/last () | 86 | (ert-deftest esh-proc-test/pipeline-connection-type/last () |
| 84 | "Test that only output streams are PTYs when a command ends a pipeline." | 87 | "Test that only output streams are PTYs when a command ends a pipeline." |
| 85 | (skip-unless (executable-find "sh")) | 88 | (skip-unless (executable-find "sh")) |
| 86 | (eshell-command-result-equal | 89 | ;; An `eshell-pipe-broken' signal might occur internally; let Eshell |
| 87 | (concat "echo | " esh-proc-test--detect-pty-cmd) | 90 | ;; handle it! |
| 88 | (unless (eq system-type 'windows-nt) | 91 | (let ((debug-on-error nil)) |
| 89 | "stdout\nstderr\n"))) | 92 | (eshell-command-result-equal |
| 93 | (concat "echo hi | " esh-proc-test--detect-pty-cmd) | ||
| 94 | (unless (eq system-type 'windows-nt) | ||
| 95 | "stdout\nstderr\n")))) | ||
| 90 | 96 | ||
| 91 | (ert-deftest esh-proc-test/kill-pipeline () | 97 | (ert-deftest esh-proc-test/kill-pipeline () |
| 92 | "Test that killing a pipeline of processes only emits a single | 98 | "Test that killing a pipeline of processes only emits a single |