mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-30 02:02:38 -07:00
Code Issues Projects Releases Wiki Activity

Add watchdog process to tramp-test36-asynchronous-requests

Browse source 
* test/lisp/net/tramp-tests.el (tramp--test-timeout-handler):
New defun.
(tramp-test36-asynchronous-requests): Use a watchdog process,
listening for SIGUSR1.
This commit is contained in:
Michael Albinus 2017-07-27 12:51:45 +02:00
parent 28faa94f1c
commit 82583d4dde
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/lisp/net/tramp-tests.el
View file

@ -3681,6 +3681,10 @@ Use the `ls' command."
tramp-connection-properties)))
(tramp--test-utf8)))
(defun tramp--test-timeout-handler ()
(interactive)
(ert-fail (format "`%s' timed out" (ert-test-name (ert-running-test)))))
;; This test is inspired by Bug#16928.
(ert-deftest tramp-test36-asynchronous-requests ()
"Check parallel asynchronous requests.
@ -3690,10 +3694,15 @@ process sentinels. They shall not disturb each other."
(skip-unless (tramp--test-enabled))
(skip-unless (tramp--test-sh-p))
;; This test could be blocked on hydra.
(with-timeout
(300 (ert-fail "`tramp-test36-asynchronous-requests' timed out"))
(let* ((tmp-name (tramp--test-make-temp-name))
;; This test could be blocked on hydra. So we set a timeout of 300
;; seconds, and we send a SIGUSR1 signal after 300 seconds.
(with-timeout (300 (tramp--test-timeout-handler))
(define-key special-event-map [sigusr1] 'tramp--test-timeout-handler)
(let* ((watchdog
(start-process
"*watchdog*" nil shell-file-name shell-command-switch
(format "sleep 300; kill -USR1 %d" (emacs-pid))))
(tmp-name (tramp--test-make-temp-name))
(default-directory tmp-name)
;; Do not cache Tramp properties.
(remote-file-name-inhibit-cache t)
@ -3806,6 +3815,8 @@ process sentinels. They shall not disturb each other."
;; Regular operation.
(tramp--test-message
"Trace 3 action %d %s %s" count buf (current-time-string))
;; Give the watchdog a chance.
(read-event nil nil 0.01)
(if (= count 2)
(if (= (length buffers) 1)
(tramp--test-instrument-test-case 10
@ -3821,8 +3832,7 @@ process sentinels. They shall not disturb each other."
;; Checks. All process output shall exists in the
;; respective buffers. All created files shall be
;; deleted.
(tramp--test-message
"Check %s" (current-time-string))
(tramp--test-message "Check %s" (current-time-string))
(dolist (buf buffers)
(with-current-buffer buf
(should (string-equal (format "%s\n" buf) (buffer-string)))))
@ -3831,6 +3841,8 @@ process sentinels. They shall not disturb each other."
tmp-name nil directory-files-no-dot-files-regexp)))
;; Cleanup.
(define-key special-event-map [sigusr1] 'ignore)
(ignore-errors (quit-process watchdog))
(dolist (buf buffers)
(ignore-errors (delete-process (get-buffer-process buf)))
(ignore-errors (kill-buffer buf)))