From: Tino Calancha <tino.calancha@gmail.com>
Date: Thu, 21 Jul 2016 12:51:24 +0000 (+0900)
Subject: Fix failing test
X-Git-Tag: emacs-26.0.90~1840^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d119be4d35f2f02cd949a203e24ce5320559ff5;p=emacs.git

Fix failing test

* test/lisp/erc/erc-track-tests.el (erc-track--erc-faces-in):
Enable Font Lock mode in order to initialize
'char-property-alias-alist' (Bug#23954).
---

diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el
index 24dfcfbe6e0..7cf3ef7bb2f 100644
--- a/test/lisp/erc/erc-track-tests.el
+++ b/test/lisp/erc/erc-track-tests.el
@@ -24,6 +24,7 @@
 
 (require 'ert)
 (require 'erc-track)
+(require 'font-core)
 
 (ert-deftest erc-track--shorten-aggressive-nil ()
   "Test non-aggressive erc track buffer name shortening."
@@ -107,9 +108,12 @@
 (ert-deftest erc-track--erc-faces-in ()
   "`erc-faces-in' should pick up both 'face and 'font-lock-face properties."
   (let ((str0 "is bold")
-        (str1 "is bold")
-        ;;(char-property-alias-alist '((face font-lock-face)))
-        )
+        (str1 "is bold"))
+    ;; Turn on Font Lock mode: this initialize `char-property-alias-alist'
+    ;; to '((face font-lock-face)).  Note that `font-lock-mode' don't
+    ;; turn on the mode if the test is run on batch mode or if the
+    ;; buffer name starts with ?\s (Bug#23954).
+    (unless font-lock-mode (font-lock-default-function 1))
     (put-text-property 3 (length str0) 'font-lock-face
                        '(bold erc-current-nick-face) str0)
     (put-text-property 3 (length str1) 'face