Try to fix some flymake-tests weirdness

* test/automated/flymake-tests.el (flymake-tests--current-face):
Sleep for longer.  Avoid querying.

diff --git a/test/ChangeLog b/test/ChangeLog
index 3cb03b9f2f4281965ea0ba8f876a4263414b0dec..3f982ac28097bd6516c97554c0fe7471c49c8ed8 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-25  Glenn Morris  <rgm@gnu.org>
+
+       * automated/flymake-tests.el (flymake-tests--current-face):
+       Sleep for longer.  Avoid querying.
+
 2014-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * automated/fns-tests.el (fns-tests-compare-string): New test.

diff --git a/test/automated/flymake-tests.el b/test/automated/flymake-tests.el
index c9761050f738b1490a48caa6bf542f906da03615..9869f699d2a7e817ca98b65f167b51e8f2f80057 100644 (file)
--- a/test/automated/flymake-tests.el
+++ b/test/automated/flymake-tests.el
@@ -40,10 +40,15 @@
           (goto-char (point-min))
           (flymake-mode 1)
           ;; XXX: is this reliable enough?
+          ;; By experiment, no it is not!
+          ;; For some reason, a single (sleep-for 1.0) does nothing here,
+          ;; but 2 * (sleep-for 0.5) works.
+          ;; FIXME what is going on...?
+          (sleep-for (+ 0.5 flymake-no-changes-timeout))
           (sleep-for (+ 0.5 flymake-no-changes-timeout))
           (flymake-goto-next-error)
           (face-at-point))
-      (and buffer (kill-buffer buffer)))))
+      (and buffer (let (kill-buffer-query-functions) (kill-buffer buffer))))))
 
 (ert-deftest warning-predicate-rx-gcc ()
   "Test GCC warning via regexp predicate."