diff options
| author | Michael Albinus | 2014-06-01 12:38:09 +0200 |
|---|---|---|
| committer | Michael Albinus | 2014-06-01 12:38:09 +0200 |
| commit | 22a949d699654eeb57742828d3d8da6f86091df6 (patch) | |
| tree | ddd49e83a979b3a7f486fb3fbf1f1a46efcc4f15 | |
| parent | 3340452bdc6a1f866e78f99a3b556f1583e20354 (diff) | |
| download | emacs-22a949d699654eeb57742828d3d8da6f86091df6.tar.gz emacs-22a949d699654eeb57742828d3d8da6f86091df6.zip | |
Revert last patch. The problem happens in the trunk.
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/automated/tramp-tests.el | 3 |
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 @@ | |||
| 1 | 2014-06-01 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * automated/tramp-tests.el (tramp-test29-vc-registered): | ||
| 4 | Instrument failed test case. | ||
| 5 | |||
| 6 | 2014-05-08 Glenn Morris <rgm@gnu.org> | 1 | 2014-05-08 Glenn Morris <rgm@gnu.org> |
| 7 | 2 | ||
| 8 | * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781) | 3 | * 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'." | |||
| 1394 | (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) | 1394 | (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) |
| 1395 | 'tramp-sh-file-name-handler)) | 1395 | 'tramp-sh-file-name-handler)) |
| 1396 | 1396 | ||
| 1397 | (tramp--instrument-test-case 10 | ||
| 1398 | (let* ((default-directory tramp-test-temporary-file-directory) | 1397 | (let* ((default-directory tramp-test-temporary-file-directory) |
| 1399 | (tmp-name1 (tramp--test-make-temp-name)) | 1398 | (tmp-name1 (tramp--test-make-temp-name)) |
| 1400 | (tmp-name2 (expand-file-name "foo" tmp-name1)) | 1399 | (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'." | |||
| 1430 | (list (file-name-nondirectory tmp-name2))))) | 1429 | (list (file-name-nondirectory tmp-name2))))) |
| 1431 | (should (vc-registered tmp-name2))) | 1430 | (should (vc-registered tmp-name2))) |
| 1432 | 1431 | ||
| 1433 | (ignore-errors (delete-directory tmp-name1 'recursive)))))) | 1432 | (ignore-errors (delete-directory tmp-name1 'recursive))))) |
| 1434 | 1433 | ||
| 1435 | (defun tramp--test-check-files (&rest files) | 1434 | (defun tramp--test-check-files (&rest files) |
| 1436 | "Runs a simple but comprehensive test over every file in FILES." | 1435 | "Runs a simple but comprehensive test over every file in FILES." |