* automated/tramp-tests.el (tramp-test07-file-exists-p):

Fix docstring.  Instrument, in order to hunt failure on hydra.

diff --git a/test/ChangeLog b/test/ChangeLog
index aac3f68..e032af4 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-06  Michael Albinus  <michael.albinus@gmx.de>
+
+       * automated/tramp-tests.el (tramp-test07-file-exists-p):
+       Fix docstring.  Instrument, in order to hunt failure on hydra.
+
 2013-11-06  Glenn Morris  <rgm@gnu.org>
 
        * automated/flymake-tests.el (warning-predicate-rx-gcc)

diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 0282763..c80d416 100644 (file)
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -501,15 +501,26 @@ and `file-name-nondirectory'."
               (unhandled-file-name-directory "/method:host:/path/to/file"))))
 
 (ert-deftest tramp-test07-file-exists-p ()
-  "Check `file-exist-p'.
-Implicitely, this checks also `write-region' and `delete-file'."
-  (skip-unless (tramp--test-enabled))
-  (let ((tmp-name (tramp--test-make-temp-name)))
+  "Check `file-exist-p', `write-region' and `delete-file'."
+  (condition-case err
+      (with-timeout (20 (should-not 'timeout))
+       (message "tramp--test-enabled")
+       (message "%S" (tramp--test-enabled))
+       (skip-unless (tramp--test-enabled))
+       (let ((tmp-name (tramp--test-make-temp-name)))
+         (message "file-exists-p")
          (should-not (file-exists-p tmp-name))
+         (message "write-region")
          (write-region "foo" nil tmp-name)
+         (message "file-exists-p")
          (should (file-exists-p tmp-name))
+         (message "delete-file")
          (delete-file tmp-name)
+         (message "file-exists-p")
          (should-not (file-exists-p tmp-name))))
+    ((error quit)
+     (message "%S" err)
+     (signal (car err) (cdr err)))))
 
 (ert-deftest tramp-test08-file-local-copy ()
   "Check `file-local-copy'."