]> git.eshelyaron.com Git - emacs.git/commitdiff
More fixes for recently added vc-rename test
authorGlenn Morris <rgm@gnu.org>
Fri, 3 Sep 2021 00:16:18 +0000 (17:16 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 3 Sep 2021 00:16:53 +0000 (17:16 -0700)
* test/lisp/vc/vc-tests.el (vc-test-cvs05-rename-file): Skip.
(vc-test-sccs05-rename-file): Treat like RCS.

test/lisp/vc/vc-tests.el

index f2807a3f0639d512908a6768898e23ec2f6a6e1f..dfe89c519bf2197a7205dd5d56a161f3a53278ca 100644 (file)
@@ -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))
         ))))