branch: externals/org
commit ce4f7db3c1d244e9b02e5974b19e9214b35ac9a6
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
test-ob-shell: Fix test failures on Emacs 26
* testing/lisp/test-ob-shell.el
(test-ob-shell/remote-with-stdin-or-cmdline):
Work around non-local exit when running tests on Emacs 26. Do no call
`kill-matching-buffers' unless Emacs in newer.
---
testing/lisp/test-ob-shell.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 5318425e60..fe975771ce 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -251,8 +251,10 @@ echo ${table[spaghetti]}
(org-trim (org-babel-execute-src-block))))
(expected (concat "ARGS: --verbose 23 71"
"\nhello tramp from " (file-local-name
default-directory))))
- (if (should (equal result expected))
- (kill-matching-buffers (format "\\*tramp/mock\\s-%s\\*"
system-name) t t)))))))
+ (if (should (equal result expected)) nil
+ ;; FIXME: Fails with non-local exit on Emacs 26.
+ (when (version<= "27" emacs-version)
+ (kill-matching-buffers (format "\\*tramp/mock\\s-%s\\*"
system-name) t t))))))))
(ert-deftest test-ob-shell/results-table ()
"Test :results table."
