@@ -42,7 +42,8 @@ runDocker f = do
4242 -- params <- clientParamsSetCA params' "~/.docker/test-ca.pem"
4343 -- let settings = mkManagerSettings (TLSSettings params) Nothing
4444 -- mgr <- newManager settings
45− runDockerT (defaultClientOpts, defaultHttpHandler) f
45+ h <- defaultHttpHandler
46+ runDockerT (defaultClientOpts, h) f
4647
4748testDockerVersion :: IO ()
4849testDockerVersion = runDocker $ do
@@ -63,13 +64,17 @@ testRunAndReadLog = runDocker $ do
6364 status1 <- startContainer defaultStartOpts c
6465 _ <- inspectContainer c >>= fromRight
6566 lift $ threadDelay 300000 -- give 300ms for the application to finish
66− lift $ assert $ status1 == Right ()
67+ lift $ assert $ isRightUnit status1
6768 status2 <- killContainer SIGTERM c
6869 logs <- getContainerLogs defaultLogOpts c >>= fromRight
69− lift $ assert $ status2 == Right ()
70+ lift $ assert $ isRightUnit status2
7071 lift $ assert $ (C.pack "123") `C.isInfixOf` (toStrict1 logs)
7172 status3 <- deleteContainer (DeleteOpts True True) c
72− lift $ assert $ status3 == Right ()
73+ lift $ assert $ isRightUnit status3
74+
75+ where
76+ isRightUnit (Right ()) = True
77+ isRightUnit _ = False
7378
7479testLogDriverOptionsJson :: TestTree
7580testLogDriverOptionsJson = testGroup "Testing LogDriverOptions JSON" [ test1, test2, test3 ]