From 46d7c786324f98e73b7615fbc9515ce9a14fa5d4 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Mon, 16 Jul 2018 07:10:14 -0400
Subject: [PATCH] ; Remove tracing for epg-tests (Bug#23561)

---
 lisp/epg-config.el     |  5 +----
 test/Makefile.in       |  1 -
 test/lisp/epg-tests.el | 37 ++++++-------------------------------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 39d264c05ad..fb866df3920 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -174,13 +174,10 @@ version requirement is met."
 (defun epg-config--make-gpg-configuration (program)
   (let (config groups type args)
     (with-temp-buffer
-      (apply #'call-process program nil
-             (list t (and (boundp 'trace-level) (> trace-level 0))) nil
+      (apply #'call-process program nil (list t nil) nil
 	     (append (if epg-gpg-home-directory
 			 (list "--homedir" epg-gpg-home-directory))
 		     '("--with-colons" "--list-config")))
-      (when (and (boundp 'trace-level) (> trace-level 0))
-        (trace-values (concat "gpg output:\n" (buffer-string))))
       (goto-char (point-min))
       (while (re-search-forward "^cfg:\\([^:]+\\):\\(.*\\)" nil t)
 	(setq type (intern (match-string 1))
diff --git a/test/Makefile.in b/test/Makefile.in
index 6070932508d..0bc893bc0c6 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -169,7 +169,6 @@ WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; }
 ifdef EMACS_HYDRA_CI
 ## On Hydra, always show logs for certain problematic tests.
 lisp/net/tramp-tests.log \
-lisp/epg-tests.log \
 : WRITE_LOG = 2>&1 | tee $@
 endif
 
diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
index a72a917fe9d..c1e98a6935e 100644
--- a/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@ -23,7 +23,6 @@
 
 (require 'ert)
 (require 'epg)
-(require 'trace)
 
 (defvar epg-tests-context nil)
 
@@ -42,34 +41,17 @@
           "2.0")
     prog-alist))
 
-(defvar epg-tests--trace nil)
-
 (defun epg-tests-find-usable-gpg-configuration
     (&optional require-passphrase require-public-key)
   ;; Clear config cache because we may be using a different
   ;; program-alist.  We do want to update the cache, so that
   ;; `epg-make-context' can use our result.
   (setq epg--configurations nil)
-  ;; Tracing for Bug#23561, but only do it once per run.
-  (when epg-tests--trace
-    (dolist (fun '(epg-find-configuration
-                   executable-find
-                   epg-check-configuration
-                   epg-config--make-gpg-configuration))
-      (trace-function-background fun))
-    (setq epg-tests--trace nil))
-  (prog1 (unwind-protect
-             (epg-find-configuration
-              'OpenPGP nil
-              ;; The symmetric operations fail on Hydra
-              ;; with gpg 2.0.
-              (if (or (not require-passphrase) require-public-key)
-                  epg-tests--config-program-alist))
-           (untrace-all))
-    (when (get-buffer "*trace-output*")
-      (princ (with-current-buffer "*trace-output*" (prog1 (buffer-string)
-                                                     (erase-buffer)))
-             #'external-debugging-output))))
+  (epg-find-configuration 'OpenPGP nil
+                          ;; The symmetric operations fail on Hydra
+                          ;; with gpg 2.0.
+                          (if (or (not require-passphrase) require-public-key)
+                              epg-tests--config-program-alist)))
 
 (defun epg-tests-passphrase-callback (_c _k _d)
   ;; Need to create a copy here, since the string will be wiped out
@@ -82,8 +64,7 @@
 			    &rest body)
   "Set up temporary locations and variables for testing."
   (declare (indent 1) (debug (sexp body)))
-  `(let* ((epg-debug epg-tests--trace)
-          (epg-tests-home-directory (make-temp-file "epg-tests-homedir" t))
+  `(let* ((epg-tests-home-directory (make-temp-file "epg-tests-homedir" t))
 	  (process-environment
 	   (append
 	    (list "GPG_AGENT_INFO"
@@ -122,15 +103,10 @@
 	     (make-local-variable 'epg-tests-context)
 	     (setq epg-tests-context context)
 	     ,@body))
-       (when epg-debug-buffer
-         (princ (with-current-buffer epg-debug-buffer
-                  (prog1 (buffer-string) (erase-buffer)))
-                #'external-debugging-output))
        (when (file-directory-p epg-tests-home-directory)
 	 (delete-directory epg-tests-home-directory t)))))
 
 (ert-deftest epg-decrypt-1 ()
-  (setq epg-tests--trace t)
   (with-epg-tests (:require-passphrase t)
     (should (equal "test"
 		   (epg-decrypt-string epg-tests-context "\
@@ -142,7 +118,6 @@ jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA==
 -----END PGP MESSAGE-----")))))
 
 (ert-deftest epg-roundtrip-1 ()
-  (setq epg-tests--trace t)
   (with-epg-tests (:require-passphrase t)
     (let ((cipher (epg-encrypt-string epg-tests-context "symmetric" nil)))
       (should (equal "symmetric"
-- 
2.39.2