diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-04-10 20:24:26 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-04-10 20:24:26 -0700 |
| commit | ab7ce8c15532d179579bb8a36e221b4d96840a2f (patch) | |
| tree | ccfa1a00b238b116a5cf8b7bf8e9c13ffed79b2a /lisp/vc | |
| parent | de8c03dc519ca124da1b410f744b3a69531fb79b (diff) | |
| download | emacs-ab7ce8c15532d179579bb8a36e221b4d96840a2f.tar.gz | |
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.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-bzr.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 34d11cf359f..505e40f46ba 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -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-temp-buffer - (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:: |