From 60c4cf6311b84ed7ec007702a0cdd7881f9f647c Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 10 Mar 2018 21:01:24 -0500
Subject: [PATCH] ; Revert "; Tracing for eieio-test random failure
 (Bug#24503)"

The tracing seems to prevent the bug from happening.
---
 test/Makefile.in                                |  1 -
 test/lisp/emacs-lisp/eieio-tests/eieio-tests.el | 21 +--------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index 4024d0286fe..42d9880e66a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -152,7 +152,6 @@ endif
 WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; }
 ifdef EMACS_HYDRA_CI
 ## On Hydra, always show logs for certain problematic tests.
-lisp/emacs-lisp/eieio-tests/eieio-tests.log \
 lisp/net/tramp-tests.log \
 : WRITE_LOG = 2>&1 | tee $@
 endif
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index 69dc16443f9..5ba094c0072 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@ -887,34 +887,15 @@ Subclasses to override slot attributes.")
   (should (= (length (eieio-build-class-alist 'opt-test1 nil)) 2))
   (should (= (length (eieio-build-class-alist 'opt-test1 t)) 1)))
 
-(mapatoms (lambda (a)
-            (when (and (fboundp a)
-                       (string-match "\\`cl--?generic"
-                                     (symbol-name a)))
-              (trace-function-background a))))
-
 (defclass eieio--testing () ())
 
 (defmethod constructor :static ((_x eieio--testing) newname &rest _args)
   (list newname 2))
 
-(defun eieio-test-dump-trace ()
-  (message "%s" (with-current-buffer "*trace-output*"
-                  (goto-char (point-min))
-                  (while (re-search-forward "[\0-\010\013-\037]" nil t)
-                    (insert (prog1 (format "\\%03o" (char-before))
-                              (delete-char -1))))
-                  (buffer-string))))
-(eieio-test-dump-trace)
-
 (ert-deftest eieio-test-37-obsolete-name-in-constructor ()
   ;; FIXME repeated intermittent failures on hydra and elsewhere (bug#24503).
   :tags '(:unstable)
-  (with-current-buffer "*trace-output*"
-    (erase-buffer))
-  (unwind-protect
-      (should (equal (eieio--testing "toto") '("toto" 2)))
-    (eieio-test-dump-trace)))
+  (should (equal (eieio--testing "toto") '("toto" 2))))
 
 (ert-deftest eieio-autoload ()
   "Tests to see whether reftex-auc has been autoloaded"
-- 
2.11.4.GIT