martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt tramp-tests.el for macOS

Browse Source 
* test/lisp/net/tramp-tests.el (tramp-test29-start-file-process)
(tramp-test30-make-process): Adapt for macOS.
This commit is contained in:
Michael Albinus
2021-09-28 15:47:01 +02:00
parent c847899081
commit 2c3c4446cf
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/lisp/net/tramp-tests.el
View File

@@ -4586,18 +4586,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(while (< (- (point-max) (point-min))
(length "66\n6F\n6F\n0D\n0A\n"))
(while (accept-process-output proc 0 nil t))))
(if (tramp--test-macos-p)
(tramp--test-message
"process-connection-type %s\n%s"
process-connection-type (pp-to-string (buffer-string)))
(should
(string-match-p
(if (memq process-connection-type '(nil pipe))
(if (and (memq process-connection-type '(nil pipe))
(not (tramp--test-macos-p)))
;; On macOS, there is always newline conversion.
;; `telnet' converts \r to <CR><NUL> if `crlf'
;; flag is FALSE. See telnet(1) man page.
"66\n6F\n6F\n0D\\(\n00\\)?\n0A\n"
"66\n6F\n6F\n0A\\(\n00\\)?\n0A\n")
(buffer-string)))))
(buffer-string))))
;; Cleanup.
(ignore-errors (delete-process proc)))))
@@ -4855,19 +4853,17 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
(while (< (- (point-max) (point-min))
(length "66\n6F\n6F\n0D\n0A\n"))
(while (accept-process-output proc 0 nil t))))
(if (tramp--test-macos-p)
(tramp--test-message
"process-connection-type %s\n%s"
process-connection-type (pp-to-string (buffer-string)))
(should
(string-match-p
(if (memq (or connection-type process-connection-type)
'(nil pipe))
(if (and (memq (or connection-type process-connection-type)
'(nil pipe))
(not (tramp--test-macos-p)))
;; On macOS, there is always newline conversion.
;; `telnet' converts \r to <CR><NUL> if `crlf'
;; flag is FALSE. See telnet(1) man page.
"66\n6F\n6F\n0D\\(\n00\\)?\n0A\n"
"66\n6F\n6F\n0A\\(\n00\\)?\n0A\n")
(buffer-string)))))
(buffer-string))))
;; Cleanup.
(ignore-errors (delete-process proc)))))))))