aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBasil L. Contovounesios2023-04-11 07:29:49 +0100
committerBasil L. Contovounesios2023-04-11 07:40:15 +0100
commitf2d212c696692879254b7fc7ca2a9b0a2999e557 (patch)
tree7542696bf0491eb48352b84aa47280aeb2946078
parent338b3718b6cf14ef13b9390928e2b13b5d4f1797 (diff)
downloademacs-f2d212c696692879254b7fc7ca2a9b0a2999e557.tar.gz
emacs-f2d212c696692879254b7fc7ca2a9b0a2999e557.zip
Fix a couple of eglot-tests
* test/lisp/progmodes/eglot-tests.el (eglot-test-rust-analyzer-watches-files): Bump timeout. (eglot-test-json-basic): Check for yas-minor-mode before using it, like other tests do (bug#61637).
-rw-r--r--test/lisp/progmodes/eglot-tests.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el
index 984c1bf9916..7ce0116636d 100644
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@ -404,7 +404,7 @@ Pass TIMEOUT to `eglot--with-timeout'."
404 ) 404 )
405 (should (eglot--tests-connect)) 405 (should (eglot--tests-connect))
406 (let (register-id) 406 (let (register-id)
407 (eglot--wait-for (s-requests 1) 407 (eglot--wait-for (s-requests 3)
408 (&key id method &allow-other-keys) 408 (&key id method &allow-other-keys)
409 (setq register-id id) 409 (setq register-id id)
410 (string= method "client/registerCapability")) 410 (string= method "client/registerCapability"))
@@ -801,6 +801,7 @@ int main() {
801(ert-deftest eglot-test-json-basic () 801(ert-deftest eglot-test-json-basic ()
802 "Test basic autocompletion in vscode-json-languageserver." 802 "Test basic autocompletion in vscode-json-languageserver."
803 (skip-unless (executable-find "vscode-json-languageserver")) 803 (skip-unless (executable-find "vscode-json-languageserver"))
804 (skip-unless (fboundp 'yas-minor-mode))
804 (eglot--with-fixture 805 (eglot--with-fixture
805 '(("project" . 806 '(("project" .
806 (("p.json" . "{\"foo.b") 807 (("p.json" . "{\"foo.b")