* automated/tramp-tests.el (tramp--instrument-test-case):

Print debug buffer in any case.

2 files changed, 13 insertions, 11 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 617ac98f5d..9b0f3ab1b0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-29  Michael Albinus  <[email protected]>
+
+	* automated/tramp-tests.el (tramp--instrument-test-case):
+	Print debug buffer in any case.
+
 2014-06-28  Leo Liu  <[email protected]>
 
 	* automated/calc-tests.el: New file and add tests for math-bignum.
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index b010ab467f..864a43d638 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -116,18 +116,15 @@ shall not contain a timeout."
   `(let ((tramp-verbose ,verbose)
 	 (tramp-message-show-message t)
 	 (tramp-debug-on-error t))
-     (condition-case err
+     (unwind-protect
 	 (progn ,@body)
-       (ert-test-skipped
-	(signal (car err) (cdr err)))
-       ((error quit)
-	(with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
-	  (with-current-buffer (tramp-get-connection-buffer v)
-	    (message "%s" (buffer-string)))
-	  (with-current-buffer (tramp-get-debug-buffer v)
-	    (message "%s" (buffer-string))))
-	(message "%s" err)
-	(signal (car err) (cdr err))))))
+       (when (> tramp-verbose 3)
+	 (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+	   (with-current-buffer (tramp-get-connection-buffer v)
+	     (message "%s" (buffer-string)))
+	   (with-current-buffer
+	       (tramp-get-debug-buffer v)
+	     (message "%s" (buffer-string))))))))
 
 (ert-deftest tramp-test00-availability ()
   "Test availability of Tramp functions."