diff options
| author | Glenn Morris | 2018-12-19 15:06:18 -0500 |
|---|---|---|
| committer | Glenn Morris | 2018-12-19 15:06:18 -0500 |
| commit | fda43a7bef499024fa5fcb32432e76c5839ee154 (patch) | |
| tree | 932d00be836b8628c03c88bcc22e902440eb20f0 | |
| parent | 4370b8ebd9ecf934ae08c76d9e7161fcb5cf7c40 (diff) | |
| download | emacs-fda43a7bef499024fa5fcb32432e76c5839ee154.tar.gz emacs-fda43a7bef499024fa5fcb32432e76c5839ee154.zip | |
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.
| -rw-r--r-- | test/lisp/vc/vc-bzr-tests.el | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ | |||
| 112 | (ert-deftest vc-bzr-test-faulty-bzr-autoloads () | 112 | (ert-deftest vc-bzr-test-faulty-bzr-autoloads () |
| 113 | "Test we can generate autoloads in a bzr directory when bzr is faulty." | 113 | "Test we can generate autoloads in a bzr directory when bzr is faulty." |
| 114 | (skip-unless (executable-find vc-bzr-program)) | 114 | (skip-unless (executable-find vc-bzr-program)) |
| 115 | ;; Avoid vc-mode-line bug; | ||
| 116 | ;; http://lists.gnu.org/r/emacs-devel/2018-12/msg00368.html | ||
| 117 | (skip-unless (not (eq 0 (user-real-uid)))) | ||
| 115 | (let* ((homedir (make-temp-file "vc-bzr-test" t)) | 118 | (let* ((homedir (make-temp-file "vc-bzr-test" t)) |
| 116 | (bzrdir (expand-file-name "bzr" homedir)) | 119 | (bzrdir (expand-file-name "bzr" homedir)) |
| 117 | (file (progn | 120 | (file (progn |