mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 15:00:34 -08:00
Code Issues Projects Releases Wiki Activity

Make vc-bzr tests work with brz 3.1 (bug#43314)

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2020-09-12 09:51:32 -07:00
parent 03093baf90
commit 184a4977c7
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/lisp/vc/vc-bzr-tests.el
View file

@ -38,13 +38,26 @@
;; abort if they cannot. I could not figure out how to stop bzr ;; 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. ;; doing that, so just give it a temporary homedir for the duration.
;; http://bugs.launchpad.net/bzr/+bug/137407 ? ;; 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)) (let* ((homedir (make-temp-file "vc-bzr-test" t))
(bzrdir (expand-file-name "bzr" homedir)) (bzrdir (expand-file-name "bzr" homedir))
(ignored-dir (progn (ignored-dir (progn
(make-directory bzrdir) (make-directory bzrdir)
(expand-file-name "ignored-dir" bzrdir))) (expand-file-name "ignored-dir" bzrdir)))
(default-directory (file-name-as-directory 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))) process-environment)))
(unwind-protect (unwind-protect
(progn (progn
@ -81,7 +94,7 @@
(expand-file-name "subdir" bzrdir))) (expand-file-name "subdir" bzrdir)))
(file (expand-file-name "file" bzrdir)) (file (expand-file-name "file" bzrdir))
(default-directory (file-name-as-directory 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))) process-environment)))
(unwind-protect (unwind-protect
(progn (progn
@ -119,7 +132,7 @@
(expand-file-name "foo.el" bzrdir))) (expand-file-name "foo.el" bzrdir)))
(default-directory (file-name-as-directory bzrdir)) (default-directory (file-name-as-directory bzrdir))
(generated-autoload-file (expand-file-name "loaddefs.el" 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))) process-environment)))
(unwind-protect (unwind-protect
(progn (progn