From: jneira <atreyu.bbb@gmail.com>
Date: Wed, 10 Jul 2019 22:08:48 +0000 (+0200)
Subject: Add a finally and timeout to ensure the call to killThread
X-Git-Tag: 0.6.1.0~2^2~18
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=fa278340d5f1bc915a250bede93258a45234ba1a

Add a finally and timeout to ensure the call to killThread
---

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