From 3269a585c4e6772af0d0e32729cfebf2662a5ba6 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 2 Jul 2017 10:06:09 +0200 Subject: [PATCH] ; Instrument tramp-tests.el --- test/lisp/net/tramp-tests.el | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index a706ed5fb90..10d52f31607 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3689,6 +3689,9 @@ process sentinels. They shall not disturb each other." (skip-unless (tramp--test-enabled)) (skip-unless (tramp--test-sh-p)) + ;; This test times out on hydra. + (with-timeout + (300 (ert-fail "`tramp-test36-asynchronous-requests' timed out")) (let* ((tmp-name (tramp--test-make-temp-name)) (default-directory tmp-name) ;; Do not cache Tramp properties. @@ -3719,9 +3722,13 @@ process sentinels. They shall not disturb each other." 0 timer-repeat (lambda () (when buffers - (let ((file + (let ((default-directory tmp-name) + (file (buffer-name (nth (random (length buffers)) buffers)))) - (funcall timer-operation file)))))) + (tramp--test-message "Start timer %s %s" timer-operation file) + (funcall timer-operation file) + (tramp--test-message + "Stop timer %s %s" timer-operation file)))))) ;; Create temporary buffers. The number of buffers ;; corresponds to the number of processes; it could be @@ -3731,6 +3738,7 @@ process sentinels. They shall not disturb each other." ;; Open asynchronous processes. Set process sentinel. (dolist (buf buffers) + (tramp--test-message "Start process %s" buf) (let ((proc (start-file-process-shell-command (buffer-name buf) buf @@ -3746,6 +3754,7 @@ process sentinels. They shall not disturb each other." (set-process-filter proc (lambda (proc string) + (tramp--test-message "Process filter %s" proc) (with-current-buffer (process-buffer proc) (insert string)) (unless (zerop (length string)) @@ -3754,6 +3763,7 @@ process sentinels. They shall not disturb each other." (set-process-sentinel proc (lambda (proc _state) + (tramp--test-message "Process sentinel %s" proc) (should-not (file-attributes (process-get proc 'foo))))))) ;; Send a string. Use a random order of the buffers. Mix @@ -3769,6 +3779,7 @@ process sentinels. They shall not disturb each other." (should-not (file-attributes file)) (should (file-attributes file))) ;; Send string to process. + (tramp--test-message "Send string %s" proc) (process-send-string proc (format "%s\n" (buffer-name buf))) (accept-process-output proc 0.1 nil 0) ;; Regular operation. @@ -3777,10 +3788,12 @@ process sentinels. They shall not disturb each other." (should (file-attributes file))) (process-put proc 'bar (1+ count)) (unless (process-live-p proc) + (tramp--test-message "Buffer delete %s" buf) (setq buffers (delq buf buffers)))))) ;; Checks. All process output shall exists in the ;; respective buffers. All created files shall be deleted. + (tramp--test-message "Checks %s" buffers) (dolist (buf buffers) (with-current-buffer buf (should (string-equal (format "%s\n" buf) (buffer-string))))) @@ -3792,7 +3805,7 @@ process sentinels. They shall not disturb each other." (ignore-errors (delete-process (get-buffer-process buf))) (ignore-errors (kill-buffer buf))) (ignore-errors (cancel-timer timer)) - (ignore-errors (delete-directory tmp-name 'recursive))))) + (ignore-errors (delete-directory tmp-name 'recursive)))))) (ert-deftest tramp-test37-recursive-load () "Check that Tramp does not fail due to recursive load." -- 2.39.2