From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#43314: vc-bzr-test-bug9726 test fails on master Date: Sat, 12 Sep 2020 12:53:46 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24752"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) To: 43314-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Sep 12 18:54:09 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kH8mv-0006M1-Mq for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 12 Sep 2020 18:54:09 +0200 Original-Received: from localhost ([::1]:58312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH8mu-0008Eg-Oc for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 12 Sep 2020 12:54:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kH8mo-0008DY-Hv for bug-gnu-emacs@gnu.org; Sat, 12 Sep 2020 12:54:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kH8mo-00039w-8S for bug-gnu-emacs@gnu.org; Sat, 12 Sep 2020 12:54:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kH8mo-0007gi-7Y for bug-gnu-emacs@gnu.org; Sat, 12 Sep 2020 12:54:02 -0400 Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Sep 2020 16:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 43314 X-GNU-PR-Package: emacs Mail-Followup-To: 43314@debbugs.gnu.org, rgm@gnu.org, stefan@marxist.se Original-Received: via spool by 43314-done@debbugs.gnu.org id=D43314.159992964129545 (code D ref 43314); Sat, 12 Sep 2020 16:54:02 +0000 Original-Received: (at 43314-done) by debbugs.gnu.org; 12 Sep 2020 16:54:01 +0000 Original-Received: from localhost ([127.0.0.1]:48899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH8mi-0007gK-7v for submit@debbugs.gnu.org; Sat, 12 Sep 2020 12:54:01 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:33482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH8mf-0007g7-F5 for 43314-done@debbugs.gnu.org; Sat, 12 Sep 2020 12:53:54 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:39359) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH8ma-00038z-5w for 43314-done@debbugs.gnu.org; Sat, 12 Sep 2020 12:53:48 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1kH8mY-0007tZ-Cd; Sat, 12 Sep 2020 12:53:46 -0400 X-Spook: Deaths outage Dick Cheney Drill Firewalls Airport X-Ran: _l.w[!>6Ar=Z0LD?A|tPp{pV^9.c@J*-/OuG_'KH*8?hcI=ASlcHbcA_)!'md\/fErkyi" X-Hue: white X-Attribution: GM In-Reply-To: (Stefan Kangas's message of "Thu, 10 Sep 2020 10:55:41 -0700") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:187904 Archived-At: Version: 27.2 commit 184a497 (HEAD, origin/emacs-27, emacs-27) Date: Sat Sep 12 09:51:32 2020 -0700 Make vc-bzr tests work with brz 3.1 (bug#43314) * test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-bug9726) (vc-bzr-test-bug9781, vc-bzr-test-faulty-bzr-autoloads): Make them work with brz 3.1. diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el index f738da7..b68a694 100644 --- a/test/lisp/vc/vc-bzr-tests.el +++ b/test/lisp/vc/vc-bzr-tests.el @@ -38,13 +38,26 @@ ;; abort if they cannot. I could not figure out how to stop bzr ;; doing that, so just give it a temporary homedir for the duration. ;; http://bugs.launchpad.net/bzr/+bug/137407 ? + ;; + ;; Note that with bzr 2.x, this works: + ;; mkdir /tmp/bzr + ;; HOME=/nonexistent BZR_HOME=/tmp/bzr bzr status + ;; but with brz 3.1, it complains: + ;; "failed to open trace file: [Errno 13] Permission denied: '/nonexistent'" + ;; which confuses vc-dir. + ;; We can quieten brz by adding either BRZ_LOG=/dev/null, or + ;; XDG_CACHE_HOME=/tmp/bzr (log defaults to XDG_CACHE_HOME/breezy/brz.log), + ;; but it seems simpler to just set HOME to a newly created + ;; temporary directory. + ;; TODO does this means tests should be setting XDG_ variables (not + ;; just HOME) to temporary values too? (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-file-name "bzr" homedir)) (ignored-dir (progn (make-directory bzrdir) (expand-file-name "ignored-dir" bzrdir))) (default-directory (file-name-as-directory bzrdir)) - (process-environment (cons (format "BZR_HOME=%s" homedir) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -81,7 +94,7 @@ (expand-file-name "subdir" bzrdir))) (file (expand-file-name "file" bzrdir)) (default-directory (file-name-as-directory bzrdir)) - (process-environment (cons (format "BZR_HOME=%s" homedir) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -119,7 +132,7 @@ (expand-file-name "foo.el" bzrdir))) (default-directory (file-name-as-directory bzrdir)) (generated-autoload-file (expand-file-name "loaddefs.el" bzrdir)) - (process-environment (cons (format "BZR_HOME=%s" homedir) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn