diff options
| author | Michael Albinus | 2023-01-28 10:26:44 +0100 |
|---|---|---|
| committer | Michael Albinus | 2023-01-28 10:26:44 +0100 |
| commit | 0820a81ec7a1dcd421b3eec345a38d8405ee00a0 (patch) | |
| tree | fb1688e5e46b89bfba5786e0d79555e0e706d490 /test/lisp/net | |
| parent | cd42244fca8785fb57c25c731afcf3227c2ad14b (diff) | |
| download | emacs-0820a81ec7a1dcd421b3eec345a38d8405ee00a0.tar.gz emacs-0820a81ec7a1dcd421b3eec345a38d8405ee00a0.zip | |
Tramp cleanup from recent test campaign
* lisp/net/tramp.el (tramp-barf-if-file-missing): Fix docstring.
(tramp-handle-file-directory-p): Don't suppress errors.
(tramp-handle-shell-command):
* lisp/net/tramp-adb.el (tramp-adb-handle-make-process):
Make insertion of a stderr file more robust.
* lisp/net/tramp-archive.el (tramp-archive-handle-directory-files):
Use `tramp-barf-if-file-missing'.
* lisp/net/tramp-sudoedit.el
(tramp-sudoedit-handle-file-name-all-completions): Protect against
errors from `file-directory-p'.
* lisp/net/tramp.el (tramp-wrong-passwd-regexp):
* lisp/net/tramp-adb.el (tramp-adb-prompt):
* lisp/net/tramp-sh.el (tramp-sh-inotifywait-process-filter):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Unify regexps.
* test/lisp/net/tramp-tests.el (tramp-test48-auto-load)
(tramp-test48-delay-load): Unify regexps.
Diffstat (limited to 'test/lisp/net')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 59e160c9d71..338482d2b61 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -7488,7 +7488,7 @@ process sentinels. They shall not disturb each other." | |||
| 7488 | ert-remote-temporary-file-directory))) | 7488 | ert-remote-temporary-file-directory))) |
| 7489 | (should | 7489 | (should |
| 7490 | (string-match-p | 7490 | (string-match-p |
| 7491 | (rx "Tramp loaded: t" (+ (any "\n\r"))) | 7491 | (rx "Tramp loaded: t" (+ (any "\r\n"))) |
| 7492 | (shell-command-to-string | 7492 | (shell-command-to-string |
| 7493 | (format | 7493 | (format |
| 7494 | "%s -batch -Q -L %s --eval %s" | 7494 | "%s -batch -Q -L %s --eval %s" |
| @@ -7516,9 +7516,9 @@ process sentinels. They shall not disturb each other." | |||
| 7516 | (should | 7516 | (should |
| 7517 | (string-match-p | 7517 | (string-match-p |
| 7518 | (rx | 7518 | (rx |
| 7519 | "Tramp loaded: nil" (+ (any "\n\r")) | 7519 | "Tramp loaded: nil" (+ (any "\r\n")) |
| 7520 | "Tramp loaded: nil" (+ (any "\n\r")) | 7520 | "Tramp loaded: nil" (+ (any "\r\n")) |
| 7521 | "Tramp loaded: " (literal (symbol-name tm)) (+ (any "\n\r"))) | 7521 | "Tramp loaded: " (literal (symbol-name tm)) (+ (any "\r\n"))) |
| 7522 | (shell-command-to-string | 7522 | (shell-command-to-string |
| 7523 | (format | 7523 | (format |
| 7524 | "%s -batch -Q -L %s --eval %s" | 7524 | "%s -batch -Q -L %s --eval %s" |