summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2014-06-01 12:38:09 +0200
committerMichael Albinus <michael.albinus@gmx.de>2014-06-01 12:38:09 +0200
commit22a949d699654eeb57742828d3d8da6f86091df6 (patch)
treeddd49e83a979b3a7f486fb3fbf1f1a46efcc4f15 /test
parent3340452bdc6a1f866e78f99a3b556f1583e20354 (diff)
downloademacs-22a949d699654eeb57742828d3d8da6f86091df6.tar.gz
Revert last patch. The problem happens in the trunk.
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/tramp-tests.el3
2 files changed, 1 insertions, 7 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 2d1c4f08fa6..443479b099e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,8 +1,3 @@
-2014-06-01 Michael Albinus <michael.albinus@gmx.de>
-
- * automated/tramp-tests.el (tramp-test29-vc-registered):
- Instrument failed test case.
-
2014-05-08 Glenn Morris <rgm@gnu.org>
* automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index ef229710cdf..2640ee9cef5 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -1394,7 +1394,6 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
'tramp-sh-file-name-handler))
- (tramp--instrument-test-case 10
(let* ((default-directory tramp-test-temporary-file-directory)
(tmp-name1 (tramp--test-make-temp-name))
(tmp-name2 (expand-file-name "foo" tmp-name1))
@@ -1430,7 +1429,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(list (file-name-nondirectory tmp-name2)))))
(should (vc-registered tmp-name2)))
- (ignore-errors (delete-directory tmp-name1 'recursive))))))
+ (ignore-errors (delete-directory tmp-name1 'recursive)))))
(defun tramp--test-check-files (&rest files)
"Runs a simple but comprehensive test over every file in FILES."