diff options
| author | Michael Albinus | 2020-09-05 19:29:47 +0200 |
|---|---|---|
| committer | Michael Albinus | 2020-09-05 19:29:47 +0200 |
| commit | 940ea1549117f56642fd6830bdbccf8865a932bb (patch) | |
| tree | 92f38a1447e10456f9ca07983b590147e602ffbd | |
| parent | a04e76ac7d553b48bd35c1331b3e6720de3ec4cc (diff) | |
| download | emacs-940ea1549117f56642fd6830bdbccf8865a932bb.tar.gz emacs-940ea1549117f56642fd6830bdbccf8865a932bb.zip | |
Adapt tramp-test30-make-process
* test/lisp/net/tramp-tests.el (tramp-list-tramp-buffers)
(tramp-time-diff): Don't declare.
(tramp-test30-make-process): Adapt test.
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index c170d2c6bf0..3914f9ae44e 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -57,9 +57,7 @@ | |||
| 57 | (declare-function tramp-get-remote-perl "tramp-sh") | 57 | (declare-function tramp-get-remote-perl "tramp-sh") |
| 58 | (declare-function tramp-get-remote-stat "tramp-sh") | 58 | (declare-function tramp-get-remote-stat "tramp-sh") |
| 59 | (declare-function tramp-list-tramp-buffers "tramp-cmds") | 59 | (declare-function tramp-list-tramp-buffers "tramp-cmds") |
| 60 | (declare-function tramp-method-out-of-band-p "tramp-sh") | ||
| 61 | (declare-function tramp-smb-get-localname "tramp-smb") | 60 | (declare-function tramp-smb-get-localname "tramp-smb") |
| 62 | (declare-function tramp-time-diff "tramp") | ||
| 63 | (defvar ange-ftp-make-backup-files) | 61 | (defvar ange-ftp-make-backup-files) |
| 64 | (defvar auto-save-file-name-transforms) | 62 | (defvar auto-save-file-name-transforms) |
| 65 | (defvar tramp-connection-properties) | 63 | (defvar tramp-connection-properties) |
| @@ -4498,11 +4496,8 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." | |||
| 4498 | ;; Read output. | 4496 | ;; Read output. |
| 4499 | (with-timeout (10 (tramp--test-timeout-handler)) | 4497 | (with-timeout (10 (tramp--test-timeout-handler)) |
| 4500 | (while (accept-process-output proc 0 nil t))) | 4498 | (while (accept-process-output proc 0 nil t))) |
| 4501 | (should | 4499 | ;; On some MS Windows systems, it returns "unknown signal". |
| 4502 | (string-match | 4500 | (should (string-match "unknown signal\\|killed" (buffer-string)))) |
| 4503 | (if (eq system-type 'windows-nt) | ||
| 4504 | "unknown signal\n\\'" "killed.*\n\\'") | ||
| 4505 | (buffer-string)))) | ||
| 4506 | 4501 | ||
| 4507 | ;; Cleanup. | 4502 | ;; Cleanup. |
| 4508 | (ignore-errors (delete-process proc))) | 4503 | (ignore-errors (delete-process proc))) |