diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-06-30 11:23:06 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-30 11:23:06 +0200 |
| commit | 10af8c58635ebc87fe1924e48bef47112ddbd96a (patch) | |
| tree | 31d6704d8a108dd2fb8b830662a5e2c0be007aa9 /test | |
| parent | efeaf19edfb34bfa517c7911449c5b61bfad17c2 (diff) | |
| download | emacs-10af8c58635ebc87fe1924e48bef47112ddbd96a.tar.gz | |
Release Tramp 2.4.2
* lisp/net/tramp.el: Bump version.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Add `add-name-to-file' error message.
(tramp--test-ignore-add-name-to-file-error): Make error handler
more explicit about the error.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index afe6488ea71..77b2c263ff8 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -168,7 +168,10 @@ properly. BODY shall not contain a timeout." `(let ((tramp-verbose (max (or ,verbose 0) (or tramp-verbose 0))) (tramp-message-show-message t) (debug-ignored-errors - (cons "^make-symbolic-link not supported$" debug-ignored-errors)) + (append + '("^make-symbolic-link not supported$" + "^error with add-name-to-file") + debug-ignored-errors)) inhibit-message) (unwind-protect (let ((tramp--test-instrument-test-case-p t)) ,@body) @@ -3162,10 +3165,9 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'." (declare (indent defun) (debug (body))) `(condition-case err (progn ,@body) - ((error quit debug) - (unless (and (eq (car err) 'file-error) - (string-match "^error with add-name-to-file" - (error-message-string err))) + (file-error + (unless (string-match "^error with add-name-to-file" + (error-message-string err)) (signal (car err) (cdr err)))))) (ert-deftest tramp-test21-file-links () |