[Emacs-diffs] trunk r117445: * automated/tramp-tests.el (tramp--instrument-test-case):

[Michael Albinus]

------------------------------------------------------------
revno: 117445
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-29 20:32:35 +0200
message:
  * automated/tramp-tests.el (tramp--instrument-test-case):
  Print debug buffer in any case.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/tramp-tests.el  tramptests.el-20131105142319-d9zp3oprkpxj5v1e-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-06-28 17:27:29 +0000
+++ b/test/ChangeLog    2014-06-29 18:32:35 +0000
@@ -1,3 +1,8 @@
+2014-06-29  Michael Albinus  <address@hidden>
+
+       * automated/tramp-tests.el (tramp--instrument-test-case):
+       Print debug buffer in any case.
+
 2014-06-28  Leo Liu  <address@hidden>
 
        * automated/calc-tests.el: New file and add tests for math-bignum.

=== modified file 'test/automated/tramp-tests.el'
--- a/test/automated/tramp-tests.el     2014-06-24 07:48:19 +0000
+++ b/test/automated/tramp-tests.el     2014-06-29 18:32:35 +0000
@@ -116,18 +116,15 @@
   `(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."