[elpa] externals/eglot 6894ed7 13/15: Tweak tests, hopefully stabilize pyls tests on Travis

[João Távora]

branch: externals/eglot
commit 6894ed719ea74be225c36e3302b6becc19ff67b6
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    Tweak tests, hopefully stabilize pyls tests on Travis
    
    * eglot-tests.el (basic-completions, hover-after-completions)
    (auto-detect-running-server, autoreconnect): Swap order of
    eglot--with-dirs-and-files and eglot--with-dirs-and-files.
    (eglot--with-dirs-and-files): Adjust indent spec.
---
 eglot-tests.el | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/eglot-tests.el b/eglot-tests.el
index 3f06732..d007cb1 100644
--- a/eglot-tests.el
+++ b/eglot-tests.el
@@ -31,7 +31,7 @@
 ;; Helpers
 
 (defmacro eglot--with-dirs-and-files (dirs &rest body)
-  (declare (indent defun) (debug t))
+  (declare (indent 1) (debug t))
   `(eglot--call-with-dirs-and-files
     ,dirs #'(lambda () ,@body)))
 
@@ -113,11 +113,11 @@
   "Visit a file and M-x eglot, then visit a neighbour. "
   (skip-unless (executable-find "rls"))
   (let (proc)
-    (eglot--with-test-timeout 2
-      (eglot--with-dirs-and-files
+    (eglot--with-dirs-and-files
         '(("project" . (("coiso.rs" . "bla")
                         ("merdix.rs" . "bla")))
           ("anotherproject" . (("cena.rs" . "bla"))))
+      (eglot--with-test-timeout 2
         (with-current-buffer
             (eglot--find-file-noselect "project/coiso.rs")
           (setq proc
@@ -137,10 +137,10 @@
   (skip-unless (executable-find "rls"))
   (let (proc
         (eglot-autoreconnect 1))
-    (eglot--with-test-timeout 3
-      (eglot--with-dirs-and-files
+    (eglot--with-dirs-and-files
         '(("project" . (("coiso.rs" . "bla")
                         ("merdix.rs" . "bla"))))
+      (eglot--with-test-timeout 3
         (with-current-buffer
             (eglot--find-file-noselect "project/coiso.rs")
           (setq proc
@@ -160,24 +160,22 @@
 (ert-deftest basic-completions ()
   "Test basic autocompletion in a python LSP"
   (skip-unless (executable-find "pyls"))
-  (unwind-protect
-      (eglot--with-test-timeout 10
-        (eglot--with-dirs-and-files
-          '(("project" . (("something.py" . "import sys\nsys.exi"))))
-          (with-current-buffer
-              (eglot--find-file-noselect "project/something.py")
-            (eglot 'python-mode `(transient . ,default-directory) '("pyls"))
-            (goto-char (point-max))
-            (completion-at-point)
-            (should (looking-back "sys.exit"))
-            )))))
+  (eglot--with-dirs-and-files
+      '(("project" . (("something.py" . "import sys\nsys.exi"))))
+    (eglot--with-test-timeout 4
+      (with-current-buffer
+          (eglot--find-file-noselect "project/something.py")
+        (eglot 'python-mode `(transient . ,default-directory) '("pyls"))
+        (goto-char (point-max))
+        (completion-at-point)
+        (should (looking-back "sys.exit"))))))
 
 (ert-deftest hover-after-completions ()
   "Test basic autocompletion in a python LSP"
   (skip-unless (executable-find "pyls"))
-  (eglot--with-test-timeout 3
-    (eglot--with-dirs-and-files
+  (eglot--with-dirs-and-files
       '(("project" . (("something.py" . "import sys\nsys.exi"))))
+    (eglot--with-test-timeout 4
       (with-current-buffer
           (eglot--find-file-noselect "project/something.py")
         (eglot 'python-mode `(transient . ,default-directory) '("pyls"))