From: Basil L. Contovounesios <contovob@tcd.ie>
Date: Tue, 11 Apr 2023 06:29:49 +0000 (+0100)
Subject: Fix a couple of eglot-tests
X-Git-Tag: emacs-29.0.91~158
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2d212c6966;p=emacs.git

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).
---

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'."
                           )
           (should (eglot--tests-connect))
           (let (register-id)
-            (eglot--wait-for (s-requests 1)
+            (eglot--wait-for (s-requests 3)
                 (&key id method &allow-other-keys)
               (setq register-id id)
               (string= method "client/registerCapability"))
@@ -801,6 +801,7 @@ int main() {
 (ert-deftest eglot-test-json-basic ()
   "Test basic autocompletion in vscode-json-languageserver."
   (skip-unless (executable-find "vscode-json-languageserver"))
+  (skip-unless (fboundp 'yas-minor-mode))
   (eglot--with-fixture
       '(("project" .
          (("p.json" . "{\"foo.b")