aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-12-02 22:15:54 -0800
committerGlenn Morris2014-12-02 22:15:54 -0800
commit7385c3e643cbdac22ad7c5e4d36c41678716b4c5 (patch)
tree3a60072675471f90886ef7128c4261dd465322f7
parente9b68bc258f30aa7d4c38ddf0a3e5bfa88c9d01d (diff)
downloademacs-7385c3e643cbdac22ad7c5e4d36c41678716b4c5.tar.gz
emacs-7385c3e643cbdac22ad7c5e4d36c41678716b4c5.zip
Fix tramp-tests, broken by incompatible vc.el change
* test/automated/tramp-tests.el (tramp-test29-vc-registered): Update for recent incompatible change in vc-register.
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/tramp-tests.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index c2c2d9b09ee..fea40786ba0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12014-12-03 Glenn Morris <rgm@gnu.org>
2
3 * automated/tramp-tests.el (tramp-test29-vc-registered):
4 Update for recent incompatible change in vc-register.
5
12014-11-29 Fabián Ezequiel Gallina <fgallina@gnu.org> 62014-11-29 Fabián Ezequiel Gallina <fgallina@gnu.org>
2 7
3 * automated/python-tests.el 8 * automated/python-tests.el
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 864a43d638f..2b2074c78ed 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -1470,8 +1470,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
1470 ;; The structure of VC-FILESET is not documented. Let's 1470 ;; The structure of VC-FILESET is not documented. Let's
1471 ;; hope it won't change. 1471 ;; hope it won't change.
1472 (vc-register 1472 (vc-register
1473 nil (list (car vc-handled-backends) 1473 (list (car vc-handled-backends)
1474 (list (file-name-nondirectory tmp-name2))))) 1474 (list (file-name-nondirectory tmp-name2)))))
1475 (should (vc-registered tmp-name2))) 1475 (should (vc-registered tmp-name2)))
1476 1476
1477 (ignore-errors (delete-directory tmp-name1 'recursive))))) 1477 (ignore-errors (delete-directory tmp-name1 'recursive)))))