Commit ab7ce8c1 authored by Glenn Morris's avatar Glenn Morris
Browse files

Add another vc-bzr test

* lisp/vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug.

* test/automated/vc-bzr.el (vc-bzr-test-faulty-bzr-autoloads): New test.
parent de8c03dc
2012-04-11 Glenn Morris <>
* vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug.
2012-04-11 Stefan Monnier <>
* window.el (window--state-get-1): Obey window-point-insertion-type.
......@@ -410,7 +410,11 @@ in the branch repository (or whose status not be determined)."
;; (unchanged . WARNING). FIXME unchanged is not the best status to
;; return in case of error.
(with-demoted-errors (vc-bzr-command "status" t 0 file))
;; This is with-demoted-errors without the condition-case-unless-debug
;; annoyance, which makes it fail during ert testing.
(let (err)
(condition-case err (vc-bzr-command "status" t 0 file)
(error (message "Error: %S" err) nil)))
(let ((status 'unchanged))
;; the only secure status indication in `bzr status' output
;; is a couple of lines following the pattern::
2012-04-11 Glenn Morris <>
* automated/vc-bzr.el (vc-bzr-test-faulty-bzr-autoloads): New test.
2012-02-13 Teodor Zlatanov <>
* automated/url-future-tests.el (url-future-tests): Move from
;;; vc-bzr.el --- tests for vc/vc-bzr.el
;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
;; Author: Glenn Morris <>
......@@ -98,4 +98,31 @@
(should (get-buffer "*vc-log*")))
(delete-directory tempdir t))))
(ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
"Test we can generate autoloads in a bzr directory when bzr is faulty."
:expected-result (if (executable-find vc-bzr-program) :passed :failed)
(should (executable-find vc-bzr-program))
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(file (expand-file-name "foo.el" tempdir))
(default-directory (file-name-as-directory tempdir))
(generated-autoload-file (expand-file-name "loaddefs.el" tempdir)))
(call-process vc-bzr-program nil nil nil "init")
(insert ";;;###autoload
\(defun foo () \"foo\" (interactive) (message \"foo!\"))")
(write-region nil nil file nil 'silent))
(call-process vc-bzr-program nil nil nil "add")
(call-process vc-bzr-program nil nil nil "commit" "-m" "Commit 1")
;; Deleting dirstate ensures both that vc-bzr's status heuristic
;; fails, so it has to call the external bzr status, and
;; causes bzr status to fail. This simulates a broken bzr
;; installation.
(delete-file ".bzr/checkout/dirstate")
(should (progn (update-directory-autoloads default-directory)
(delete-directory tempdir t))))
;;; vc-bzr.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment