From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Sep 2021 00:16:18 +0000 (-0700)
Subject: More fixes for recently added vc-rename test
X-Git-Tag: emacs-28.0.90~1216
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=926e69b20792630d0b6ac21c2a914703962722e4;p=emacs.git

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.
---

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))
         ))))