emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 926e69b: More fixes for recently added vc-rename test


From: Glenn Morris
Subject: master 926e69b: More fixes for recently added vc-rename test
Date: Thu, 2 Sep 2021 20:17:08 -0400 (EDT)

branch: master
commit 926e69b20792630d0b6ac21c2a914703962722e4
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    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.
---
 test/lisp/vc/vc-tests.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index f2807a3..dfe89c5 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))
         ))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]