]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt tramp-test30-make-process
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 5 Sep 2020 17:29:47 +0000 (19:29 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 5 Sep 2020 17:29:47 +0000 (19:29 +0200)
* test/lisp/net/tramp-tests.el (tramp-list-tramp-buffers)
(tramp-time-diff): Don't declare.
(tramp-test30-make-process): Adapt test.

test/lisp/net/tramp-tests.el

index c170d2c6bf0a75c89c79fad595530dce782e54fc..3914f9ae44eaa617cafc1b6c85ee01f22e97f8a0 100644 (file)
@@ -57,9 +57,7 @@
 (declare-function tramp-get-remote-perl "tramp-sh")
 (declare-function tramp-get-remote-stat "tramp-sh")
 (declare-function tramp-list-tramp-buffers "tramp-cmds")
-(declare-function tramp-method-out-of-band-p "tramp-sh")
 (declare-function tramp-smb-get-localname "tramp-smb")
-(declare-function tramp-time-diff "tramp")
 (defvar ange-ftp-make-backup-files)
 (defvar auto-save-file-name-transforms)
 (defvar tramp-connection-properties)
@@ -4498,11 +4496,8 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
            ;; Read output.
            (with-timeout (10 (tramp--test-timeout-handler))
              (while (accept-process-output proc 0 nil t)))
-           (should
-            (string-match
-             (if (eq system-type 'windows-nt)
-                 "unknown signal\n\\'" "killed.*\n\\'")
-             (buffer-string))))
+           ;; On some MS Windows systems, it returns "unknown signal".
+           (should (string-match "unknown signal\\|killed" (buffer-string))))
 
        ;; Cleanup.
        (ignore-errors (delete-process proc)))