Merge branch 'master' into joel/low-level-testing (fixing borked rebase, sorry!)

This commit is contained in:
Joel Stanley 2016-05-25 17:23:50 -07:00
commit 378d92efcf

View file

@ -99,8 +99,8 @@ testClientRequestNoServer =
reqResult @?= (Left GRPCIOTimeout) reqResult @?= (Left GRPCIOTimeout)
testServerAwaitNoClient :: TestTree testServerAwaitNoClient :: TestTree
testServerAwaitNoClient = testServerAwaitNoClient = testCase "server wait times out when no client " $ do
grpcTest "Server - registered call handler timeout" $ \grpc -> do withGRPC $ \grpc -> do
let conf = (ServerConfig "localhost" 50051 [("/foo", "localhost", Normal)]) let conf = (ServerConfig "localhost" 50051 [("/foo", "localhost", Normal)])
withServer grpc conf $ \server -> do withServer grpc conf $ \server -> do
let method = head (registeredMethods server) let method = head (registeredMethods server)
@ -110,7 +110,8 @@ testServerAwaitNoClient =
testServerUnregisteredAwaitNoClient :: TestTree testServerUnregisteredAwaitNoClient :: TestTree
testServerUnregisteredAwaitNoClient = testServerUnregisteredAwaitNoClient =
grpcTest "Server - unregistered call handler timeout" $ \grpc -> do testCase "server wait times out when no client -- unregistered method " $ do
withGRPC $ \grpc -> do
let conf = ServerConfig "localhost" 50051 [] let conf = ServerConfig "localhost" 50051 []
withServer grpc conf $ \server -> do withServer grpc conf $ \server -> do
result <- serverHandleNormalCall server 10 M.empty $ result <- serverHandleNormalCall server 10 M.empty $