Improve tramp-interrupt-process robustness

* lisp/net/tramp.el (tramp-interrupt-process): Wait, until the
process has disappeared.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 07c06808bb22c2d0b2c3c804c34bc15b8035be41..abcd5282d3a7b296457707669352a1b8ff58f881 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4556,6 +4556,12 @@ Only works for Bourne-like shells."
         'tramp-send-command
         (tramp-get-connection-property proc "vector" nil)
         (format "kill -2 %d" pid))
+       ;; Wait, until the process has disappeared.
+       (with-timeout
+           (1 (tramp-error proc 'error "Process %s did not interrupt" proc))
+         (while (process-live-p proc)
+           ;; We cannot run `tramp-accept-process-output', it blocks timers.
+           (accept-process-output proc 0.1)))
        ;; Report success.
        proc))))