diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-09-02 17:16:18 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-09-02 17:16:53 -0700 |
| commit | 926e69b20792630d0b6ac21c2a914703962722e4 (patch) | |
| tree | a09cb0042dc12a54ab9ee411ccc70e793dd32363 | |
| parent | 0db50c3fd5580cfa077d81c484a29f2821ceb02d (diff) | |
| download | emacs-926e69b20792630d0b6ac21c2a914703962722e4.tar.gz emacs-926e69b20792630d0b6ac21c2a914703962722e4.tar.bz2 emacs-926e69b20792630d0b6ac21c2a914703962722e4.zip | |
More fixes for recently added vc-rename test
* test/lisp/vc/vc-tests.el (vc-test-cvs05-rename-file): Skip.
(vc-test-sccs05-rename-file): Treat like RCS.
| -rw-r--r-- | test/lisp/vc/vc-tests.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el index f2807a3f063..dfe89c519bf 100644 --- a/test/lisp/vc/vc-tests.el +++ b/test/lisp/vc/vc-tests.el @@ -589,7 +589,7 @@ This checks also `vc-backend' and `vc-responsible-backend'." (should (file-exists-p new-name)) (should (equal (vc-state new-name) - (if (eq backend 'RCS) + (if (memq backend '(RCS SCCS)) 'up-to-date 'added))))) @@ -711,6 +711,9 @@ This checks also `vc-backend' and `vc-responsible-backend'." (ert-get-test ',(intern (format "vc-test-%s01-register" backend-string)))))) + ;; CVS calls vc-delete-file, which insists on prompting + ;; "Really want to delete ...?" + (skip-unless (not (eq 'CVS ',backend))) (vc-test--rename-file ',backend)) )))) |