]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt Tramp tests
authorMichael Albinus <michael.albinus@gmx.de>
Tue, 6 May 2025 10:22:45 +0000 (12:22 +0200)
committerEshel Yaron <me@eshelyaron.com>
Sat, 10 May 2025 14:04:10 +0000 (16:04 +0200)
* test/lisp/net/tramp-tests.el (tramp-test29-start-file-process)
(tramp-test30-make-process): Adapt tests.

(cherry picked from commit ed7b55f6bf1b8d0ceb40c9e196d8b31fd6afc21e)

test/lisp/net/tramp-tests.el

index 56d696d507423673e1a837fbc1eac72f4bf0b2d5..9a7213a8a92cd2a628583c58b28e22b84ca7e571 100644 (file)
@@ -5059,6 +5059,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
            (with-timeout (10 (tramp--test-timeout-handler))
              (while (< (- (point-max) (point-min)) (length "foo"))
                (while (accept-process-output proc 0 nil t))))
+            ;; Some `cat' implementations do not support the `cat -'
+            ;; call.  We skip then.
+            (skip-unless
+             (not
+              (string-match-p (rx "cat: -: input file is output file\n")
+                              (buffer-string))))
            (should (string-match-p "foo" (buffer-string))))
 
        ;; Cleanup.
@@ -5253,6 +5259,12 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
            (with-timeout (10 (tramp--test-timeout-handler))
              (while (< (- (point-max) (point-min)) (length "foo"))
                (while (accept-process-output proc 0 nil t))))
+            ;; Some `cat' implementations do not support the `cat -'
+            ;; call.  We skip then.
+            (skip-unless
+             (not
+              (string-match-p (rx "cat: -: input file is output file\n")
+                              (buffer-string))))
            (should (string-match-p "foo" (buffer-string))))
 
        ;; Cleanup.