diff options
| author | Michael Albinus | 2017-07-31 09:43:04 +0200 |
|---|---|---|
| committer | Michael Albinus | 2017-07-31 09:43:04 +0200 |
| commit | 55d62d344a0c2ad6c2726fae04366b2a3ed87f6f (patch) | |
| tree | c6d926494e28ebad7971c6eff5b1da7a7b9254cd | |
| parent | 6ebef3daf24c847d6f16621489ae587e98c11ec0 (diff) | |
| download | emacs-55d62d344a0c2ad6c2726fae04366b2a3ed87f6f.tar.gz emacs-55d62d344a0c2ad6c2726fae04366b2a3ed87f6f.zip | |
; Change instrumentation code in tramp-tests.el
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 979f674f0f1..3e28eb62fc2 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -149,7 +149,6 @@ handled properly. BODY shall not contain a timeout." | |||
| 149 | (debug-ignored-errors | 149 | (debug-ignored-errors |
| 150 | (cons "^make-symbolic-link not supported$" debug-ignored-errors)) | 150 | (cons "^make-symbolic-link not supported$" debug-ignored-errors)) |
| 151 | inhibit-message) | 151 | inhibit-message) |
| 152 | (message "tramp--test-instrument-test-case %s" tramp-verbose) | ||
| 153 | (unwind-protect | 152 | (unwind-protect |
| 154 | (let ((tramp--test-instrument-test-case-p t)) ,@body) | 153 | (let ((tramp--test-instrument-test-case-p t)) ,@body) |
| 155 | ;; Unwind forms. | 154 | ;; Unwind forms. |
| @@ -3908,23 +3907,15 @@ process sentinels. They shall not disturb each other." | |||
| 3908 | (should-not (file-attributes file)) | 3907 | (should-not (file-attributes file)) |
| 3909 | (should (file-attributes file))) | 3908 | (should (file-attributes file))) |
| 3910 | ;; Send string to process. | 3909 | ;; Send string to process. |
| 3911 | (tramp--test-message | ||
| 3912 | "Trace 1 action %d %s %s" count buf (current-time-string)) | ||
| 3913 | (process-send-string proc (format "%s\n" (buffer-name buf))) | 3910 | (process-send-string proc (format "%s\n" (buffer-name buf))) |
| 3914 | (tramp--test-message | ||
| 3915 | "Trace 2 action %d %s %s" count buf (current-time-string)) | ||
| 3916 | (accept-process-output proc 0.1 nil 0) | 3911 | (accept-process-output proc 0.1 nil 0) |
| 3917 | (tramp--test-message | ||
| 3918 | "Trace 3 action %d %s %s" count buf (current-time-string)) | ||
| 3919 | ;; Give the watchdog a chance. | 3912 | ;; Give the watchdog a chance. |
| 3920 | (read-event nil nil 0.01) | 3913 | (read-event nil nil 0.01) |
| 3921 | ;; Regular operation. | 3914 | ;; Regular operation. |
| 3922 | (if (= count 2) | 3915 | (tramp--test-instrument-test-case 10 |
| 3923 | (if (= (length buffers) 1) | 3916 | (if (= count 2) |
| 3924 | (tramp--test-instrument-test-case 10 | 3917 | (should-not (file-attributes file)) |
| 3925 | (should-not (file-attributes file))) | 3918 | (should (file-attributes file)))) |
| 3926 | (should-not (file-attributes file))) | ||
| 3927 | (should (file-attributes file))) | ||
| 3928 | (tramp--test-message | 3919 | (tramp--test-message |
| 3929 | "Stop action %d %s %s" count buf (current-time-string)) | 3920 | "Stop action %d %s %s" count buf (current-time-string)) |
| 3930 | (process-put proc 'bar (1+ count)) | 3921 | (process-put proc 'bar (1+ count)) |