git.iko.soy/docker-hs
on master help sign in
Merge remote-tracking branch 'jprider63/master'
b4c6a2bDeni Bertovic
src/Docker/Client/Api.hs+1−1
compare with master
unifiedsplit
@@ -43,7 +43,7 @@ import Docker.Client.Types
43import Docker.Client.Utils
43import Docker.Client.Utils
44
44
45requestUnit :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError ())
45requestUnit :: (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
47
47
48requestHelper :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError BSL.ByteString)
48requestHelper :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError BSL.ByteString)
49requestHelper verb endpoint = requestHelper' verb endpoint Conduit.sinkLbs
49requestHelper verb endpoint = requestHelper' verb endpoint Conduit.sinkLbs
tests/tests.hs+8
@@ -54,6 +54,11 @@ testDockerVersion =
54 do v <- getDockerVersion
54 do v <- getDockerVersion
55 lift $ assert $ isRight v
55 lift $ assert $ isRight v
56
56
57+testStopNonexisting :: IO ()
58+testStopNonexisting = runDocker $ do
59+ res <- stopContainer DefaultTimeout $ fromJust $ toContainerID "thisshouldnotexist"
60+ lift $ assert $ isLeft res
61+
57testFindImage :: IO ()
62testFindImage :: IO ()
58testFindImage =
63testFindImage =
59 runDocker $
64 runDocker $
@@ -158,6 +163,7 @@ integrationTests =
158 [ testCase "Get docker version" testDockerVersion
163 [ testCase "Get docker version" testDockerVersion
159 , testCase "Find image by name" testFindImage
164 , testCase "Find image by name" testFindImage
160 , testCase "Run a dummy container and read its log" testRunAndReadLog
165 , testCase "Run a dummy container and read its log" testRunAndReadLog
166+ , testCase "Try to stop a container that doesn't exist" testStopNonexisting
161 ]
167 ]
162
168
163jsonTests :: TestTree
169jsonTests :: TestTree
@@ -174,6 +180,8 @@ jsonTests =
174setup :: IO ()
180setup :: IO ()
175setup = system ("docker build -t " ++ unpack testImageName ++ " tests") >> return ()
181setup = system ("docker build -t " ++ unpack testImageName ++ " tests") >> return ()
176
182
183+isLeft = not . isRight
184+
177isRight (Left _) = False
185isRight (Left _) = False
178isRight (Right _) = True
186isRight (Right _) = True
179
187