diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-15 13:53:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-15 13:53:40 -0800 |
| commit | 9bd8f01cd6613795e6a7bb228b1aff342cc88c8b (patch) | |
| tree | aa566ea564a3d8e344c3015b997a6478e2010b5d /test/lisp/emacs-lisp/eieio-tests | |
| parent | e6b1df09551fc02aedcba4dbf5ee91dad4686e9a (diff) | |
| parent | 2c0cfa64553dc1d4d376b42b56e52a007222736b (diff) | |
| download | emacs-9bd8f01cd6613795e6a7bb228b1aff342cc88c8b.tar.gz | |
Merge from origin/emacs-26
2c0cfa6455 * ChangeLog.3: Update
4387bb44ae Update authors
bce51bd6f7 * lisp/gnus/message.el (message-do-auto-fill): Prevent do-...
bd2a2a1e84 Improve documentation of etags
7ba75b9637 Teach etags new interpreters for some languages
1f7f03742d * lisp/emacs-lisp/generator.el (iter-defun): Add 'doc-stri...
dbb4aac212 * lisp/emacs-lisp/syntax.el (syntax-propertize): Fix bug#2...
80463a43da Improve documentation of fill-separate-heterogeneous-words...
4bd2416d55 Fix documentation of some x-* functions
9c2b11484f Inherit query-on-exit flag to stderr process (Bug#30031)
3efb1e7def Fix Bug#30057
a9b884c60f Tag some unstable tests, and skip by default (bug#24503)
# Conflicts:
# test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
Diffstat (limited to 'test/lisp/emacs-lisp/eieio-tests')
| -rw-r--r-- | test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el | 2 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/eieio-tests/eieio-tests.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el index 84661e8770b..c6da9e15fa3 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el @@ -192,7 +192,7 @@ (ert-deftest eieio-test-method-order-list-6 () ;; FIXME repeated intermittent failures on hydra (bug#24503) ;; ((:STATIC C) (:STATIC C-base1) (:STATIC C-base2)) != ((:STATIC C))") - (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + :tags '(:unstable) (let ((eieio-test-method-order-list nil) (ans '( (:STATIC C) diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el index 4657321506b..69dc16443f9 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el @@ -908,7 +908,8 @@ Subclasses to override slot attributes.") (eieio-test-dump-trace) (ert-deftest eieio-test-37-obsolete-name-in-constructor () - ;; FIXME repeated intermittent failures on hydra (bug#24503) + ;; FIXME repeated intermittent failures on hydra and elsewhere (bug#24503). + :tags '(:unstable) (with-current-buffer "*trace-output*" (erase-buffer)) (unwind-protect |