summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTino Calancha <tino.calancha@gmail.com>2016-07-21 21:51:24 +0900
committerTino Calancha <tino.calancha@gmail.com>2016-07-21 21:51:24 +0900
commit1d119be4d35f2f02cd949a203e24ce5320559ff5 (patch)
tree9884edf7264a35f682a9877e4bb696409e08f859 /test
parenta066fb1ceee373c982214c28206108c5fba01bf7 (diff)
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).
Diffstat (limited to 'test')
-rw-r--r--test/lisp/erc/erc-track-tests.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el
index 24dfcfbe6e..7cf3ef7bb2 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