Make sure process is terminated on failure in Launcher specs

cardano-foundation · Jul 12, 2019 · f55b140 · f55b140
1 parent 39050fd
commit f55b140
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/lib/http-bridge/test/integration/Test/Integration/HttpBridge/Scenario/CLI/Launcher.hs b/lib/http-bridge/test/integration/Test/Integration/HttpBridge/Scenario/CLI/Launcher.hs
@@ -71,6 +71,7 @@ spec = do
                 expectPathEventuallyExist d
                 expectPathEventuallyExist (d <> "/testnet")
                 expectPathEventuallyExist (d <> "/wallet.db")
+              `finally` do
                 terminateProcess ph
                 TIO.hGetContents o >>= TIO.putStrLn
                 TIO.hGetContents e >>= TIO.putStrLn
@@ -83,6 +84,7 @@ spec = do
                 expectPathEventuallyExist d
                 expectPathEventuallyExist (d <> "/testnet")
                 expectPathEventuallyExist (d <> "/wallet.db")
+              `finally` do
                 terminateProcess ph
                 TIO.hGetContents o >>= TIO.putStrLn
                 TIO.hGetContents e >>= TIO.putStrLn
@@ -98,13 +100,15 @@ spec = do
                 waitForServer @t ctx
                 let pwd = "passphrase"
                 (_, out, _) <- createWalletViaCLI @t ctx ["n"] m "\n" pwd
+                expectValidJSON (Proxy @ApiWallet) out
+              `finally` do
                 terminateProcess ph
                 TIO.hGetContents o >>= TIO.putStrLn
                 TIO.hGetContents e >>= TIO.putStrLn
-                expectValidJSON (Proxy @ApiWallet) out
             withCreateProcess process $ \_ (Just o) (Just e) ph -> do
                 waitForServer @t ctx
-                expectEventually' ctx state Ready wallet `finally` do
+                expectEventually' ctx state Ready wallet
+              `finally` do
                     terminateProcess ph
                     TIO.hGetContents o >>= TIO.putStrLn
                     TIO.hGetContents e >>= TIO.putStrLn

diff --git a/lib/http-bridge/test/integration/Test/Integration/HttpBridge/Scenario/CLI/Server.hs b/lib/http-bridge/test/integration/Test/Integration/HttpBridge/Scenario/CLI/Server.hs
@@ -50,6 +50,7 @@ spec = do
                 let process = proc' (commandName @t) args
                 withCreateProcess process $ \_ _ _ ph -> do
                     expectPathEventuallyExist db
+                  `finally` do
                     terminateProcess ph
             threadDelay oneSecond
 

diff --git a/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Launcher.hs b/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Launcher.hs
@@ -87,6 +87,7 @@ spec = do
                     expectPathEventuallyExist (d <> "/jormungandr")
                     expectPathEventuallyExist (d <> "/jormungandr-config.json")
                     expectPathEventuallyExist (d <> "/wallet.db")
+                  `finally` do
                     terminateProcess ph
                     TIO.hGetContents o >>= TIO.putStrLn
                     TIO.hGetContents e >>= TIO.putStrLn
@@ -146,16 +147,18 @@ spec = do
                 waitForServer @t ctx
                 let pwd = "passphrase"
                 (_, out, _) <- createWalletViaCLI @t ctx ["n"] m "\n" pwd
+                expectValidJSON (Proxy @ApiWallet) out
+              `finally` do
                 terminateProcess ph
                 TIO.hGetContents o >>= TIO.putStrLn
                 TIO.hGetContents e >>= TIO.putStrLn
-                expectValidJSON (Proxy @ApiWallet) out
             withCreateProcess process $ \_ (Just o) (Just e) ph -> do
                 waitForServer @t ctx
-                expectEventually' ctx state Ready wallet `finally` do
-                    terminateProcess ph
-                    TIO.hGetContents o >>= TIO.putStrLn
-                    TIO.hGetContents e >>= TIO.putStrLn
+                expectEventually' ctx state Ready wallet
+              `finally` do
+                terminateProcess ph
+                TIO.hGetContents o >>= TIO.putStrLn
+                TIO.hGetContents e >>= TIO.putStrLn
 
     describe "DaedalusIPC" $ do
         let defaultArgs =

diff --git a/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Server.hs b/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Server.hs
@@ -11,6 +11,8 @@ import Prelude
 
 import Control.Concurrent
     ( threadDelay )
+import Control.Exception
+    ( finally )
 import Control.Monad
     ( forM_ )
 import System.Exit
@@ -53,6 +55,7 @@ spec = do
                 let process = proc' (commandName @t) args
                 withCreateProcess process $ \_ _ _ ph -> do
                     expectPathEventuallyExist db
+                  `finally` do
                     terminateProcess ph
             threadDelay oneSecond