From fda43a7bef499024fa5fcb32432e76c5839ee154 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 19 Dec 2018 15:06:18 -0500
Subject: [PATCH] Skip a vc-bzr test if run as root

* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-faulty-bzr-autoloads):
Skip this test when run as root.  This works around a race
condition in root-specific code in vc-mode-line when deleting a file.

; Do not merge to master, instead fix vc-mode-line there.
---
 test/lisp/vc/vc-bzr-tests.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 6b96f3b928d..db64f61c43d 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -112,6 +112,9 @@
 (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
   "Test we can generate autoloads in a bzr directory when bzr is faulty."
   (skip-unless (executable-find vc-bzr-program))
+  ;; Avoid vc-mode-line bug;
+  ;; http://lists.gnu.org/r/emacs-devel/2018-12/msg00368.html
+  (skip-unless (not (eq 0 (user-real-uid))))
   (let* ((homedir (make-temp-file "vc-bzr-test" t))
          (bzrdir (expand-file-name "bzr" homedir))
          (file (progn
-- 
2.39.5