[debbugs-tracker] bug#14937: closed (vc-bzr.el test fails when bzr installed but using Git checkout of Emacs)

[GNU bug Tracking System]

Your message dated Tue, 23 Jul 2013 12:49:46 -0400
with message-id <address@hidden>
and subject line Re: bug#14937: vc-bzr.el test fails when bzr installed but 
using Git checkout of Emacs
has caused the debbugs.gnu.org bug report #14937,
regarding vc-bzr.el test fails when bzr installed but using Git checkout of 
Emacs
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
14937: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14937
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> vc-bzr.el test fails when bzr installed but using Git checkout of Emacs
>
>
>
>
> Date: 
>
> Tue, 23 Jul 2013 09:13:24 -0400
>
>
>
>
> Patch follows. May I install to trunk?
>
> diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el
> index 2776435..09010aa 100644
> --- a/test/automated/vc-bzr.el
> +++ b/test/automated/vc-bzr.el
> @@ -31,10 +31,14 @@
>  ;; bzr installed.  We could just put everything inside an IF
>  ;; statement, but it would be nice if ERT had a "skipped" facility (?).
>
> +(defun vc-bzr-test-p ()
> +  (and (executable-find vc-bzr-program)
> +       (file-accessible-directory-p ".bzr")))
> +
>  (ert-deftest vc-bzr-test-bug9726 ()
>    "Test for http://debbugs.gnu.org/9726 ."
> -  :expected-result (if (executable-find vc-bzr-program) :passed :failed)
> -  (should (executable-find vc-bzr-program))
> +  :expected-result (if (vc-bzr-test-p) :passed :failed)
> +  (should (vc-bzr-test-p))
>    (let* ((tempdir (make-temp-file "vc-bzr-test" t))
>           (ignored-dir (expand-file-name "ignored-dir" tempdir))
>           (default-directory (file-name-as-directory tempdir)))
> @@ -64,8 +68,8 @@
>  ;; Not specific to bzr.
>  (ert-deftest vc-bzr-test-bug9781 ()
>    "Test for http://debbugs.gnu.org/9781 ."
> -  :expected-result (if (executable-find vc-bzr-program) :passed :failed)
> -  (should (executable-find vc-bzr-program))
> +  :expected-result (if (vc-bzr-test-p) :passed :failed)
> +  (should (vc-bzr-test-p))
>    (let* ((tempdir (make-temp-file "vc-bzr-test" t))
>           (subdir (expand-file-name "subdir" tempdir))
>           (file (expand-file-name "file" tempdir))
> @@ -101,8 +105,8 @@
>  ;; http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html
>  (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))
> +  :expected-result (if (vc-bzr-test-p) :passed :failed)
> +  (should (vc-bzr-test-p))
>    (let* ((tempdir (make-temp-file "vc-bzr-test" t))
>           (file (expand-file-name "foo.el" tempdir))
>           (default-directory (file-name-as-directory tempdir))
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#14937: vc-bzr.el test fails when bzr installed but using Git checkout of Emacs
>
>
>
>
> Date: 
>
> Tue, 23 Jul 2013 12:49:46 -0400
>
>
>
>
> On Tue, Jul 23, 2013 at 12:04 PM, Glenn Morris <address@hidden> wrote:
> >
> > I can't reproduce such a failure, don't see why it should fail in such a
> > case, nor how this change can be correct (see below). Could you show the
> > actual failure message?
>
> I mistook error messages as test failures and then jumped to a
> conclusion. Closing.
>
>
> --- End Message ---