Skip to content

Ignore SessionException during test cleanup from listener thread #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crtschin wants to merge 1 commit into from
+16 −5
Closed

Ignore SessionException during test cleanup from listener thread #637

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions lsp-test/src/Language/LSP/Test/Session.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedLabels #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE ViewPatterns #-}

module Language.LSP.Test.Session
( Session(..)
Expand Down Expand Up @@ -302,7 +303,7 @@ runSession' serverIn serverOut mServerProc serverHandler config caps rootDir exi
(ignoreRegistrationRequests config)
runSession' = runSessionMonad context initState

errorHandler = throwTo mainThreadId :: SessionException -> IO ()
errorHandler e = throwTo mainThreadId (SomeAsyncException (e :: SessionException))
serverListenerLauncher =
async $ catch (serverHandler serverOut context) errorHandler
msgTimeoutMs = messageTimeout config * 10^6
Expand All @@ -316,10 +317,20 @@ runSession' serverIn serverOut mServerProc serverHandler config caps rootDir exi
#endif
cleanupProcess (Just serverIn, Just serverOut, Nothing, sp)
| otherwise = pure ()
finally (timeout msgTimeoutMs (runSession' exitServer))
-- Make sure to kill the listener first, before closing
-- handles etc via cleanupProcess
(cancel async >> cleanup)

finally
-- If we get interrupted by the listener thread, we may be waiting
-- for a message that won't come / reading from a handle that's been
-- closed.
--
-- Seeing as we're in the cleanup stage already, ignore that specific
-- class of errors.
(void (timeout msgTimeoutMs (runSession' exitServer)) `catch`
(\(asyncExceptionFromException -> Just (_ :: SessionException)) -> pure ()))

-- Make sure to kill the listener first, before closing
-- handles etc via cleanupProcess
(cancel async >> cleanup)

(result, _) <- bracket serverListenerLauncher
serverAndListenerFinalizer
Expand Down