emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 940ea15 2/2: Adapt tramp-test30-make-process


From: Michael Albinus
Subject: master 940ea15 2/2: Adapt tramp-test30-make-process
Date: Sat, 5 Sep 2020 13:29:56 -0400 (EDT)

branch: master
commit 940ea1549117f56642fd6830bdbccf8865a932bb
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    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.
---
 test/lisp/net/tramp-tests.el | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c170d2c..3914f9a 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]