From: Glenn Morris <rgm@gnu.org>
Date: Tue, 2 Jul 2019 23:46:25 +0000 (-0700)
Subject: Change expected result of a flymake test on hydra
X-Git-Tag: emacs-27.0.90~2116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20c1406cd04038c4b2d50c9eb0742e21c8e14984;p=emacs.git

Change expected result of a flymake test on hydra

* test/lisp/progmodes/flymake-tests.el (different-diagnostic-types):
Test is now passing on hydra.nixos.org, since today.
---

diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 77929d395f5..8616dc6c02b 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -144,9 +144,7 @@ SEVERITY-PREDICATE is used to setup
 
 (ert-deftest different-diagnostic-types ()
   "Test GCC warning via function predicate."
-  ;; http://lists.gnu.org/archive/html/emacs-devel/2019-03/msg01043.html
-  :expected-result (if (or (getenv "EMACS_HYDRA_CI") (getenv "EMACS_EMBA_CI"))
-                       :failed :passed)
+  :expected-result (if (getenv "EMACS_EMBA_CI") :failed :passed)
   (skip-unless (and (executable-find "gcc")
                     (version<=
                      "5" (string-trim