X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FSession.hs;h=21a5fe7002af4061552c390bbc24442bec4786d2;hp=1777f15f2750a913e812df81c7a42d7c6156fee1;hb=fa278340d5f1bc915a250bede93258a45234ba1a;hpb=bd2ac7da01645dc111a6912be661bc13b7f9340f

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 1777f15..21a5fe7 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -65,6 +65,7 @@ import Language.Haskell.LSP.Test.Exceptions
 import System.Console.ANSI
 import System.Directory
 import System.IO
+import System.Timeout
 
 -- | A session representing one instance of launching and connecting to a server.
 --
@@ -216,7 +217,8 @@ runSessionWithHandles serverIn serverOut serverHandler config caps rootDir exitS
       
       errorHandler = throwTo mainThreadId :: SessionException -> IO()
       serverLauncher = forkIO $ catch (serverHandler serverOut context) errorHandler
-      serverFinalizer tid = runSession' exitServer >> killThread tid
+      serverFinalizer tid = finally (timeout 60000000 (runSession' exitServer))
+                                    (killThread tid)
       
   (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session)
   return result