b4c6a2b · docker-hs · git.iko.soy

git.iko.soy/docker-hs

Merge remote-tracking branch 'jprider63/master'

commitb4c6a2b92906cc785684825c6549741e167473fe authorDeni Bertovic <deni@denibertovic.com> dateWed 1 Nov 2017, 11:37 (9 years ago) parent5cac8a0 c5ae488

2 files changed+9−1

compare with master

unifiedsplit

src/Docker/Client/Api.hs+1−1 tests/tests.hs+8

src/Docker/Client/Api.hs+1−1

@@ -43,7 +43,7 @@ import Docker.Client.Types

4343import Docker.Client.Utils

4444

4545requestUnit :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError ())

46−requestUnit verb endpoint = const (Right ()) <$> requestHelper verb endpoint

46+requestUnit verb endpoint = fmap (const ()) <$> requestHelper verb endpoint

4747

4848requestHelper :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError BSL.ByteString)

4949requestHelper verb endpoint = requestHelper' verb endpoint Conduit.sinkLbs

tests/tests.hs+8

@@ -54,6 +54,11 @@ testDockerVersion =

5454 do v <- getDockerVersion

5555 lift $ assert $ isRight v

5656

57+testStopNonexisting :: IO ()

58+testStopNonexisting = runDocker $ do

59+ res <- stopContainer DefaultTimeout $ fromJust $ toContainerID "thisshouldnotexist"

60+ lift $ assert $ isLeft res

61+

5762testFindImage :: IO ()

5863testFindImage =

5964 runDocker $

@@ -158,6 +163,7 @@ integrationTests =

158163 [ testCase "Get docker version" testDockerVersion

159164 , testCase "Find image by name" testFindImage

160165 , testCase "Run a dummy container and read its log" testRunAndReadLog

166+ , testCase "Try to stop a container that doesn't exist" testStopNonexisting

161167 ]

162168

163169jsonTests :: TestTree

@@ -174,6 +180,8 @@ jsonTests =

174180setup :: IO ()

175181setup = system ("docker build -t " ++ unpack testImageName ++ " tests") >> return ()

176182

183+isLeft = not . isRight

184+

177185isRight (Left _) = False

178186isRight (Right _) = True

179187