lsp: Stop suppressing TimeoutError

swyddfa · Dec 1, 2024 · 39123f8 · 39123f8
1 parent 895d637
commit 39123f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/lib/esbonio/tests/e2e/conftest.py b/lib/esbonio/tests/e2e/conftest.py
@@ -86,8 +86,4 @@ async def client(lsp_client: LanguageClient, uri_for, tmp_path_factory):
     yield
 
     # Teardown
-    try:
-        await asyncio.wait_for(lsp_client.shutdown_session(), timeout=2.0)
-    except (asyncio.TimeoutError, TimeoutError):
-        # HACK: Working around openlawlibrary/pygls#433
-        print("Gave up waiting for process to exit")
+    await asyncio.wait_for(lsp_client.shutdown_session(), timeout=2.0)
diff --git a/lib/esbonio/tests/e2e/test_e2e_diagnostics.py b/lib/esbonio/tests/e2e/test_e2e_diagnostics.py
@@ -172,11 +172,7 @@ async def pub_client(lsp_client: LanguageClient, uri_for, tmp_path_factory):
     yield
 
     # Teardown
-    try:
-        await asyncio.wait_for(lsp_client.shutdown_session(), timeout=2.0)
-    except (asyncio.TimeoutError, TimeoutError):
-        # HACK: Working around openlawlibrary/pygls#433
-        print("Gave up waiting for process to exit")
+    await asyncio.wait_for(lsp_client.shutdown_session(), timeout=2.0)
 
 
 @pytest.mark.asyncio(loop_scope="module")

diff --git a/lib/esbonio/tests/server/conftest.py b/lib/esbonio/tests/server/conftest.py
@@ -41,8 +41,4 @@ async def client(request, uri_for, lsp_client: LanguageClient):
     yield
 
     # Teardown
-    try:
-        await asyncio.wait_for(lsp_client.shutdown_session(), timeout=2.0)
-    except (asyncio.TimeoutError, TimeoutError):
-        # HACK: Working around openlawlibrary/pygls#433
-        print("Gave up waiting for process to exit")
+    await asyncio.wait_for(lsp_client.shutdown_session(), timeout=2.0)