procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More fixes to Eglot tests

Browse source 
* test/lisp/progmodes/eglot-tests.el
(eglot-test-project-wide-diagnostics-rust-analyzer): Make even more
robust.
(eglot--wait-for): flush-standard-output doesn't exist in older
Emacsen.
(eglot-test-basic-diagnostics): Increase timeout.
This commit is contained in:
João Távora 2023-03-15 00:36:26 +00:00
parent cf7db4d9dd
commit a054c4aa4a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/lisp/progmodes/eglot-tests.el
View file

@ -281,8 +281,11 @@ then restored."
do
;; `read-event' is essential to have the file
;; watchers come through.
(read-event nil nil 0.1)
(princ ".") (flush-standard-output)
(cond ((fboundp 'flush-standard-output)
(read-event nil nil 0.1) (princ ".")
(flush-standard-output))
(t
(read-event "." nil 0.1)))
(accept-process-output nil 0.1))))
(setq ,events-sym (cdr events))
(cl-destructuring-bind (&key method id &allow-other-keys) (car events)
@ -441,7 +444,7 @@ then restored."
(eglot--find-file-noselect "diag-project/main.c")
(eglot--sniffing (:server-notifications s-notifs)
(eglot--tests-connect)
(eglot--wait-for (s-notifs 2)
(eglot--wait-for (s-notifs 10)
(&key _id method &allow-other-keys)
(string= method "textDocument/publishDiagnostics"))
(flymake-start)
@ -826,9 +829,10 @@ pylsp prefers autopep over yafp, despite its README stating the contrary."
(eglot--sniffing (:server-notifications s-notifs)
(eglot--tests-connect)
(flymake-start)
(eglot--wait-for (s-notifs 10)
(&key _id method &allow-other-keys)
(string= method "textDocument/publishDiagnostics"))
(eglot--wait-for (s-notifs 15)
(&key _id method params &allow-other-keys)
(and (string= method "textDocument/publishDiagnostics")
(string-suffix-p "main.rs" (plist-get params :uri))))
(let* ((diags (flymake--project-diagnostics)))
(should (cl-some (lambda (diag)
(let ((locus (flymake-diagnostic-buffer diag)))