Catch WS.ConnectionClosed

Author: phadej

test/Servant/Client/JSaddleSpec.hs

@@ -8,7 +8,10 @@ module Servant.Client.JSaddleSpec where
 
 import           Control.Concurrent
                  (threadDelay)
-import           Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
+import           Control.Concurrent.MVar
+                 (newEmptyMVar, putMVar, takeMVar)
+import           Control.Exception
+                 (handle, throwIO)
 import           Control.Monad.Trans
 import           Data.Aeson
 import           Data.ByteString
@@ -28,15 +31,16 @@ import qualified Language.Javascript.JSaddle.WebSockets as WS
 import qualified Network.HTTP.Types                     as Http
 import qualified Network.Wai                            as Wai
 import           Network.Wai.Handler.Warp               as Warp
-import qualified System.Process as P
 import           Network.Wai.Middleware.AddHeaders
 import           Network.Wai.Middleware.Cors
                  (simpleCors)
 import           Network.WebSockets
                  (defaultConnectionOptions)
+import qualified Network.WebSockets                     as WS
 import           Servant.API
 import           Servant.Client.JSaddle
 import           Servant.Server
+import qualified System.Process                         as P
 import           Test.Hspec
 
 type TestApi = ReqBody '[OctetStream] ByteString :> Post '[JSON] TestResponse
@@ -104,7 +108,11 @@ spec = do
       let serverApp :: IO Application
           serverApp = pure $ logRequest $ addCors $ serve testApi testServer
 
-      Warp.testWithApplication serverApp $ \serverPort -> do
+      let handler :: WS.ConnectionException -> IO ()
+          handler WS.ConnectionClosed = return ()
+          handler e                   = throwIO e
+
+      handle handler $ Warp.testWithApplication serverApp $ \serverPort -> do
           threadDelay $ 500 * 1000
 
           let clientApp :: IO Application