@@ -25,13 +25,18 @@ import Control.Concurrent.MVar
26import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
26import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
27import Control.Exception (SomeException, throwIO, ErrorCall(..))
27import Control.Exception (SomeException, throwIO, ErrorCall(..))
28−import qualified Control.Exception as Ex (catch)
28+import Control.Monad.Catch (try, catch, finally, mask, onException)
29−import Control.Applicative ((<$>), (<*>), pure, (<|>))
29+import Control.Applicative ((<|>))
30import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
30import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
31−import Control.Distributed.Process
31+import Control.Distributed.Process hiding
32import Control.Distributed.Process.Internal.Types
38import Control.Distributed.Process.Internal.Types
33− ( NodeId(nodeAddress)
34− , LocalNode(localEndPoint)
39+ ( LocalNode(localEndPoint)
35 , ProcessExitException(..)
40 , ProcessExitException(..)
36 , nullProcessId
41 , nullProcessId
37 , createUnencodedMessage
42 , createUnencodedMessage
@@ -39,12 +44,13 @@ import Control.Distributed.Process.Internal.Types
39import Control.Distributed.Process.Node
44import Control.Distributed.Process.Node
40import Control.Distributed.Process.Debug
45import Control.Distributed.Process.Debug
41import Control.Distributed.Process.Management.Internal.Types
46import Control.Distributed.Process.Management.Internal.Types
47+import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
42import Control.Distributed.Process.Serializable (Serializable)
48import Control.Distributed.Process.Serializable (Serializable)
43−
49+import Data.Maybe (isNothing, isJust)
44−import Test.HUnit (Assertion, assertFailure, assertBool)
50+import Test.HUnit (Assertion, assertBool, assertFailure)
45import Test.Framework (Test, testGroup)
51import Test.Framework (Test, testGroup)
46import Test.Framework.Providers.HUnit (testCase)
52import Test.Framework.Providers.HUnit (testCase)
47−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
48import Control.Rematch.Run (Match(..))
54import Control.Rematch.Run (Match(..))
50newtype Ping = Ping ProcessId
56newtype Ping = Ping ProcessId
@@ -67,7 +73,7 @@ expectThat a matcher = case res of
67forkTry :: IO () -> IO ThreadId
73forkTry :: IO () -> IO ThreadId
68forkTry p = do
74forkTry p = do
69 tid <- myThreadId
75 tid <- myThreadId
70− forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
76+ forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
72-- | The ping server from the paper
78-- | The ping server from the paper
73ping :: Process ()
79ping :: Process ()
@@ -77,12 +83,46 @@ ping = do
77 send partner (Ping self)
83 send partner (Ping self)
86+verifyClient :: String -> MVar Bool -> IO ()
87+verifyClient s b = takeMVar b >>= assertBool s
89+expectPing :: MVar Bool -> Process ()
90+expectPing mv = expect >>= liftIO . putMVar mv . checkPing
92+ checkPing (Ping _) = True
80-- | Quick and dirty synchronous version of whereisRemoteAsync
94-- | Quick and dirty synchronous version of whereisRemoteAsync
81whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
95whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
82whereisRemote nid string = do
96whereisRemote nid string = do
83 whereisRemoteAsync nid string
97 whereisRemoteAsync nid string
84− WhereIsReply _ mPid <- expect
99+ match (\(WhereIsReply _ mPid) -> return mPid)
102+verifyWhereIsRemote :: NodeId -> String -> Process ProcessId
103+verifyWhereIsRemote n s = whereisRemote n s >>= maybe (die "remote name not found") return
105+waitForExit :: ProcessId -> Process DiedReason
106+waitForExit pid = monitor pid >>= waitForDown
108+waitForDown :: MonitorRef -> Process DiedReason
110+ receiveWait [ matchIf (\(ProcessMonitorNotification ref' _ _) -> ref == ref')
111+ (\(ProcessMonitorNotification _ _ dr) -> return dr) ]
113+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
114+syncBreakConnection breakConnection nid0 nid1 = do
116+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
117+ runProcess nid0 $ do
118+ them <- liftIO $ takeMVar m
119+ pinger <- spawnLocal $ forever $ send them ()
120+ _ <- monitorNode (localNodeId nid1)
121+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
122+ (nodeAddress $ localNodeId nid1)
123+ NodeMonitorNotification _ _ _ <- expect
124+ kill pinger "finished"
85− return mPid
125+ return ()
87data Add = Add ProcessId Double Double deriving (Typeable)
127data Add = Add ProcessId Double Double deriving (Typeable)
88data Divide = Divide ProcessId Double Double deriving (Typeable)
128data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -157,12 +197,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
157 unmonitor ref
197 unmonitor ref
158 liftIO $ putMVar done ()
198 liftIO $ putMVar done ()
159 (False, ref) -> do
199 (False, ref) -> do
160− ProcessMonitorNotification ref' pid reason' <- expect
201+ match (\(ProcessMonitorNotification ref' pid reason') -> do
203+ assertBool "Bad Monitor Signal"
161− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
204+ (Just ref' == ref && pid == theirAddr &&
205+ mOrL && reason == reason')
162− liftIO $ putMVar done ()
206+ putMVar done ())
164 (\(ProcessLinkException pid reason') -> do
209 (\(ProcessLinkException pid reason') -> do
210+ (liftIO $ assertBool "link exception unmatched" $
165− True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
211+ pid == theirAddr && not mOrL && not un && reason == reason')
166 liftIO $ putMVar done ()
212 liftIO $ putMVar done ()
@@ -193,8 +239,10 @@ testPing TestTransport{..} = do
193 pid <- getSelfPid
239 pid <- getSelfPid
194 replicateM_ numPings $ do
240 replicateM_ numPings $ do
195 send pingServer (Pong pid)
241 send pingServer (Pong pid)
196− Ping _ <- expect
242+ p <- expectTimeout 3000000
197− return ()
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
199 putMVar clientDone ()
247 putMVar clientDone ()
@@ -281,7 +329,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
281 runProcess localNode $ do
329 runProcess localNode $ do
282 monitor theirAddr
330 monitor theirAddr
283 -- wait for the process to die
331 -- wait for the process to die
284− ProcessMonitorNotification _ _ _ <- expect
332+ expect :: Process ProcessMonitorNotification
285 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
287 takeMVar done
335 takeMVar done
@@ -355,14 +403,17 @@ testMath TestTransport{..} = do
355 runProcess localNode $ do
403 runProcess localNode $ do
356 pid <- getSelfPid
404 pid <- getSelfPid
357 send mathServer (Add pid 1 2)
405 send mathServer (Add pid 1 2)
358− 3 <- expect :: Process Double
406+ three <- expect :: Process Double
359 send mathServer (Divide pid 8 2)
407 send mathServer (Divide pid 8 2)
360− 4 <- expect :: Process Double
408+ four <- expect :: Process Double
361 send mathServer (Divide pid 8 0)
409 send mathServer (Divide pid 8 0)
362− DivByZero <- expect
410+ divByZ <- expect
363− liftIO $ putMVar clientDone ()
411+ liftIO $ putMVar clientDone (three, four, divByZ)
365− takeMVar clientDone
413+ res <- takeMVar clientDone
415+ (3, 4, DivByZero) -> return ()
416+ _ -> error $ "Something went horribly wrong"
367-- | Send first message (i.e. connect) to an already terminated process
418-- | Send first message (i.e. connect) to an already terminated process
368-- (without monitoring); then send another message to a second process on
419-- (without monitoring); then send another message to a second process on
@@ -390,11 +441,9 @@ testSendToTerminated TestTransport{..} = do
390 pid <- getSelfPid
441 pid <- getSelfPid
391 send server1 "Hi"
442 send server1 "Hi"
392 send server2 (Pong pid)
443 send server2 (Pong pid)
394− True <- return $ pid' == server2
395− liftIO $ putMVar clientDone ()
444+ expectPing clientDone
397− takeMVar clientDone
446+ verifyClient "Expected Ping from server" clientDone
399-- | Test (non-zero) timeout
448-- | Test (non-zero) timeout
400testTimeout :: TestTransport -> Assertion
449testTimeout :: TestTransport -> Assertion
@@ -403,10 +452,10 @@ testTimeout TestTransport{..} = do
403 done <- newEmptyMVar
452 done <- newEmptyMVar
405 runProcess localNode $ do
454 runProcess localNode $ do
406− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
455+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
407− liftIO $ putMVar done ()
456+ liftIO $ putMVar done $ res == Nothing
409− takeMVar done
458+ verifyClient "Expected receiveTimeout to timeout..." done
411-- | Test zero timeout
460-- | Test zero timeout
412testTimeout0 :: TestTransport -> Assertion
461testTimeout0 :: TestTransport -> Assertion
@@ -434,10 +483,9 @@ testTimeout0 TestTransport{..} = do
434 -- is not interested in, and then a single message that it wants
483 -- is not interested in, and then a single message that it wants
435 replicateM_ 10000 $ send server "Irrelevant message"
484 replicateM_ 10000 $ send server "Irrelevant message"
436 send server (Pong pid)
485 send server (Pong pid)
438− liftIO $ putMVar clientDone ()
486+ expectPing clientDone
440− takeMVar clientDone
488+ verifyClient "Expected Ping from server" clientDone
442-- | Test typed channels
490-- | Test typed channels
443testTypedChannels :: TestTransport -> Assertion
491testTypedChannels :: TestTransport -> Assertion
@@ -460,10 +508,10 @@ testTypedChannels TestTransport{..} = do
460 runProcess localNode $ do
508 runProcess localNode $ do
461 (clientSendPort, rport) <- newChan
509 (clientSendPort, rport) <- newChan
462 sendChan serverSendPort (clientSendPort, 5)
510 sendChan serverSendPort (clientSendPort, 5)
463− False <- receiveChan rport
511+ ch <- receiveChan rport
464− liftIO $ putMVar clientDone ()
512+ liftIO $ putMVar clientDone $ ch == False
466− takeMVar clientDone
514+ verifyClient "Expected channel to send 'False'" clientDone
468-- | Test merging receive ports
516-- | Test merging receive ports
469testMergeChannels :: TestTransport -> Assertion
517testMergeChannels :: TestTransport -> Assertion
@@ -486,9 +534,8 @@ testMergeChannels TestTransport{..} = do
486 rs <- mapM charChannel "abc"
534 rs <- mapM charChannel "abc"
487 m <- mergePorts biased rs
535 m <- mergePorts biased rs
488 xs <- replicateM 9 $ receiveChan m
536 xs <- replicateM 9 $ receiveChan m
489− True <- return $ xs == expected
490− liftIO $ putMVar done ()
537+ liftIO $ putMVar done $ xs == expected
491− takeMVar done
538+ verifyClient "Expected single layer merge to match expected ordering" done
493 -- Two layers of merging
540 -- Two layers of merging
494 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -499,9 +546,8 @@ testMergeChannels TestTransport{..} = do
499 ms <- mapM (mergePorts biasedInner) rss
546 ms <- mapM (mergePorts biasedInner) rss
500 m <- mergePorts biasedOuter ms
547 m <- mergePorts biasedOuter ms
501 xs <- replicateM (9 * 3) $ receiveChan m
548 xs <- replicateM (9 * 3) $ receiveChan m
502− True <- return $ xs == expected
549+ liftIO $ putMVar done $ xs == expected
503− liftIO $ putMVar done ()
550+ verifyClient "Expected nested channels to match expeted ordering" done
506 -- Test that if no messages are (immediately) available, the scheduler makes no difference
552 -- Test that if no messages are (immediately) available, the scheduler makes no difference
507 testBlocked :: LocalNode -> Bool -> IO ()
553 testBlocked :: LocalNode -> Bool -> IO ()
@@ -510,43 +556,45 @@ testMergeChannels TestTransport{..} = do
510 done <- newEmptyMVar
556 done <- newEmptyMVar
512 forkProcess localNode $ do
558 forkProcess localNode $ do
513− [sa, sb, sc] <- liftIO $ mapM readMVar vs
559+ ss <- liftIO $ mapM readMVar vs
514− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
562+ mapM_ ((>> pause 10000) . uncurry sendChan)
515− [ -- a, b, c
563+ [ -- a, b, c
516− (sa, 'a')
564+ (sa, 'a')
517− , (sb, 'b')
565+ , (sb, 'b')
518− , (sc, 'c')
566+ , (sc, 'c')
519− -- a, c, b
567+ -- a, c, b
520− , (sa, 'a')
568+ , (sa, 'a')
521− , (sc, 'c')
569+ , (sc, 'c')
522− , (sb, 'b')
570+ , (sb, 'b')
523− -- b, a, c
571+ -- b, a, c
524− , (sb, 'b')
572+ , (sb, 'b')
525− , (sa, 'a')
573+ , (sa, 'a')
526− , (sc, 'c')
574+ , (sc, 'c')
527− -- b, c, a
575+ -- b, c, a
528− , (sb, 'b')
576+ , (sb, 'b')
529− , (sc, 'c')
577+ , (sc, 'c')
530− , (sa, 'a')
578+ , (sa, 'a')
531− -- c, a, b
579+ -- c, a, b
532− , (sc, 'c')
580+ , (sc, 'c')
533− , (sa, 'a')
581+ , (sa, 'a')
534− , (sb, 'b')
582+ , (sb, 'b')
535− -- c, b, a
583+ -- c, b, a
536− , (sc, 'c')
584+ , (sc, 'c')
537− , (sb, 'b')
585+ , (sb, 'b')
538− , (sa, 'a')
586+ , (sa, 'a')
588+ _ -> die "Something went horribly wrong"
541 forkProcess localNode $ do
590 forkProcess localNode $ do
542 (ss, rs) <- unzip <$> replicateM 3 newChan
591 (ss, rs) <- unzip <$> replicateM 3 newChan
543 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
544 m <- mergePorts biased rs
593 m <- mergePorts biased rs
545 xs <- replicateM (6 * 3) $ receiveChan m
594 xs <- replicateM (6 * 3) $ receiveChan m
546− True <- return $ xs == "abcacbbacbcacabcba"
547− liftIO $ putMVar done ()
595+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
549− takeMVar done
597+ verifyClient "Expected merged ports to match expected ordering" done
551 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
552 mergePorts True = mergePortsBiased
600 mergePorts True = mergePortsBiased
@@ -564,8 +612,9 @@ testTerminate TestTransport{..} = do
564 localNode <- newLocalNode testTransport initRemoteTable
612 localNode <- newLocalNode testTransport initRemoteTable
565 runProcess localNode $ do
613 runProcess localNode $ do
566 e <- try terminate :: Process (Either ProcessTerminationException ())
614 e <- try terminate :: Process (Either ProcessTerminationException ())
567− True <- return $ either show show e == show ProcessTerminationException
615+ if either show show e == show ProcessTerminationException
568− return ()
616+ then return ()
617+ else die "Unexpected result from terminate"
570testMonitorNode :: TestTransport -> Assertion
619testMonitorNode :: TestTransport -> Assertion
571testMonitorNode TestTransport{..} = do
620testMonitorNode TestTransport{..} = do
@@ -576,11 +625,12 @@ testMonitorNode TestTransport{..} = do
577 runProcess node2 $ do
626 runProcess node2 $ do
578 ref <- monitorNode (localNodeId node1)
627 ref <- monitorNode (localNodeId node1)
579− NodeMonitorNotification ref' nid DiedDisconnect <- expect
629+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
580− True <- return $ ref == ref' && nid == localNodeId node1
630+ return $ ref == ref' && nid == localNodeId node1)
581− liftIO $ putMVar done ()
631+ ] >>= liftIO . putMVar done
583− takeMVar done
633+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
585testMonitorLiveNode :: TestTransport -> Assertion
635testMonitorLiveNode :: TestTransport -> Assertion
586testMonitorLiveNode TestTransport{..} = do
636testMonitorLiveNode TestTransport{..} = do
@@ -595,15 +645,16 @@ testMonitorLiveNode TestTransport{..} = do
595 liftIO $ putMVar ready ()
645 liftIO $ putMVar ready ()
596 liftIO $ takeMVar readyr
646 liftIO $ takeMVar readyr
597 send p ()
647 send p ()
598− NodeMonitorNotification ref' nid _ <- expect
649+ match (\(NodeMonitorNotification ref' nid _) ->
599− True <- return $ ref == ref' && nid == localNodeId node1
650+ (return $ ref == ref' && nid == localNodeId node1))
600− liftIO $ putMVar done ()
651+ ] >>= liftIO . putMVar done
602 takeMVar ready
653 takeMVar ready
603 closeLocalNode node1
654 closeLocalNode node1
604 putMVar readyr ()
655 putMVar readyr ()
606− takeMVar done
657+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
608testMonitorChannel :: TestTransport -> Assertion
659testMonitorChannel :: TestTransport -> Assertion
609testMonitorChannel TestTransport{..} = do
660testMonitorChannel TestTransport{..} = do
@@ -613,18 +664,20 @@ testMonitorChannel TestTransport{..} = do
613 pid <- forkProcess node1 $ do
664 pid <- forkProcess node1 $ do
614 sport <- expect :: Process (SendPort ())
665 sport <- expect :: Process (SendPort ())
615 ref <- monitorPort sport
666 ref <- monitorPort sport
616− PortMonitorNotification ref' port' reason <- expect
667+ receiveWait [
617− -- reason might be DiedUnknownId if the receive port is GCed before the
668+ -- reason might be DiedUnknownId if the receive port is GCed before the
618− -- monitor is established (TODO: not sure that this is reasonable)
669+ -- monitor is established (TODO: not sure that this is reasonable)
670+ match (\(PortMonitorNotification ref' port' reason) ->
671+ return $ ref' == ref && port' == sendPortId sport &&
619− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
672+ (reason == DiedNormal || reason == DiedUnknownId))
620− liftIO $ putMVar gotNotification ()
673+ ] >>= liftIO . putMVar gotNotification
622 runProcess node2 $ do
675 runProcess node2 $ do
623 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
624 send pid sport
677 send pid sport
625 liftIO $ threadDelay 100000
678 liftIO $ threadDelay 100000
627− takeMVar gotNotification
680+ verifyClient "Expected PortMonitorNotification" gotNotification
629testRegistry :: TestTransport -> Assertion
682testRegistry :: TestTransport -> Assertion
630testRegistry TestTransport{..} = do
683testRegistry TestTransport{..} = do
@@ -636,20 +689,28 @@ testRegistry TestTransport{..} = do
637 runProcess node $ do
690 runProcess node $ do
638 register "ping" pingServer
691 register "ping" pingServer
639− Just pid <- whereis "ping"
692+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
640− True <- return $ pingServer == pid
641 us <- getSelfPid
693 us <- getSelfPid
642 nsend "ping" (Pong us)
694 nsend "ping" (Pong us)
643− Ping pid' <- expect
695+ receiveWait [
644− True <- return $ pingServer == pid'
696+ matchIf (\(Ping pid') -> pingServer == pid') (const $ return ())
645− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
697+ ]
646− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
698+ checkRegException "dead" Nothing deadProcess
647− True <- return $ x == pingServer
699+ checkRegException "ping" (Just pingServer) deadProcess
648− Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
700+ try (unregister "dead") >>= checkReg "dead" Nothing
649 liftIO $ putMVar done ()
701 liftIO $ putMVar done ()
651 takeMVar done
703 takeMVar done
706+ checkRegException name pid dead =
707+ try (register name dead) >>= checkReg name pid
709+ checkReg name pid res =
711+ Left (ProcessRegistrationException name pid) -> return ()
712+ _ -> die $ "Unexpected Registration" ++ show res
653testRegistryRemoteProcess :: TestTransport -> Assertion
714testRegistryRemoteProcess :: TestTransport -> Assertion
654testRegistryRemoteProcess TestTransport{..} = do
715testRegistryRemoteProcess TestTransport{..} = do
655 node1 <- newLocalNode testTransport initRemoteTable
716 node1 <- newLocalNode testTransport initRemoteTable
@@ -660,13 +721,13 @@ testRegistryRemoteProcess TestTransport{..} = do
661 runProcess node2 $ do
722 runProcess node2 $ do
662 register "ping" pingServer
723 register "ping" pingServer
663− Just pid <- whereis "ping"
724+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
664− True <- return $ pingServer == pid
665 us <- getSelfPid
725 us <- getSelfPid
666 nsend "ping" (Pong us)
726 nsend "ping" (Pong us)
667− Ping pid' <- expect
727+ receiveWait [
668− True <- return $ pingServer == pid'
728+ matchIf (\(Ping pid') -> pingServer == pid')
669− liftIO $ putMVar done ()
729+ (const $ liftIO $ putMVar done ())
671 takeMVar done
732 takeMVar done
@@ -674,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
674testRemoteRegistry TestTransport{..} = do
735testRemoteRegistry TestTransport{..} = do
675 node1 <- newLocalNode testTransport initRemoteTable
736 node1 <- newLocalNode testTransport initRemoteTable
676 node2 <- newLocalNode testTransport initRemoteTable
737 node2 <- newLocalNode testTransport initRemoteTable
677− done <- newEmptyMVar
679 pingServer <- forkProcess node1 ping
739 pingServer <- forkProcess node1 ping
680 deadProcess <- forkProcess node1 (return ())
740 deadProcess <- forkProcess node1 (return ())
@@ -687,32 +747,34 @@ testRemoteRegistry TestTransport{..} = do
687 "ping" == label' && pid == pingServer)
747 "ping" == label' && pid == pingServer)
688 (\(RegisterReply _ _ _) -> return ()) ]
748 (\(RegisterReply _ _ _) -> return ()) ]
690− Just pid <- whereisRemote nid1 "ping"
750+ pid <- verifyWhereIsRemote nid1 "ping"
691− True <- return $ pingServer == pid
751+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
692 us <- getSelfPid
753 us <- getSelfPid
693 nsendRemote nid1 "ping" (Pong us)
754 nsendRemote nid1 "ping" (Pong us)
694− Ping pid' <- expect
755+ receiveWait [
695− True <- return $ pingServer == pid'
756+ match (\(Ping pid') -> return $ pingServer == pid')
757+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
697 -- test that if process was not registered Nothing is returned
759 -- test that if process was not registered Nothing is returned
698 -- in owner field.
760 -- in owner field.
699 registerRemoteAsync nid1 "dead" deadProcess
761 registerRemoteAsync nid1 "dead" deadProcess
701− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
762+ receiveWait [ matchIf (\(RegisterReply label' f mPid) -> "dead" == label')
702− (\(RegisterReply _ _ _) -> return ()) ]
763+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
764+ ] >>= liftIO . assertBool "Expected False Nothing in RegisterReply"
703 registerRemoteAsync nid1 "ping" deadProcess
766 registerRemoteAsync nid1 "ping" deadProcess
704 receiveWait [
767 receiveWait [
705− matchIf (\(RegisterReply label' False (Just pid)) ->
768+ matchIf (\(RegisterReply label' False mPid) ->
706− "ping" == label' && pid == pingServer)
769+ "ping" == label' && isJust mPid)
707− (\(RegisterReply _ _ _) -> return ()) ]
770+ (\(RegisterReply _ f (Just pid'')) -> return (not f && pid'' == pingServer))
771+ ] >>= liftIO . assertBool "Expected False and (Just alreadyRegisteredPid) in RegisterReply"
708 unregisterRemoteAsync nid1 "dead"
773 unregisterRemoteAsync nid1 "dead"
709 receiveWait [
774 receiveWait [
710− matchIf (\(RegisterReply label' False Nothing) ->
775+ matchIf (\(RegisterReply label' _ _) -> "dead" == label')
711− "dead" == label' && pid == pingServer)
776+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
712− (\(RegisterReply _ _ _) -> return ()) ]
777+ ] >>= liftIO . assertBool "Expected False and Nothing in RegisterReply"
713− liftIO $ putMVar done ()
717testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
718testRemoteRegistryRemoteProcess TestTransport{..} = do
780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -728,15 +790,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
728 receiveWait [
790 receiveWait [
729 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
730 (\(RegisterReply _ _ _) -> return ()) ]
792 (\(RegisterReply _ _ _) -> return ()) ]
731− Just pid <- whereisRemote nid1 "ping"
793+ pid <- verifyWhereIsRemote nid1 "ping"
732− True <- return $ pingServer == pid
794+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
733 us <- getSelfPid
795 us <- getSelfPid
734 nsendRemote nid1 "ping" (Pong us)
796 nsendRemote nid1 "ping" (Pong us)
735− Ping pid' <- expect
797+ receiveWait [
736− True <- return $ pingServer == pid'
798+ match (\(Ping pid') -> return $ pingServer == pid')
737− liftIO $ putMVar done ()
799+ ] >>= liftIO . putMVar done
739− takeMVar done
801+ verifyClient "Expected Ping with ping server's ProcessId" done
741testSpawnLocal :: TestTransport -> Assertion
803testSpawnLocal :: TestTransport -> Assertion
742testSpawnLocal TestTransport{..} = do
804testSpawnLocal TestTransport{..} = do
@@ -750,15 +812,14 @@ testSpawnLocal TestTransport{..} = do
750 sport <- expect
812 sport <- expect
751 sendChan sport (1234 :: Int)
813 sendChan sport (1234 :: Int)
753− sport <- spawnChannelLocal $ \rport -> do
815+ sport <- spawnChannelLocal $
754− (1234 :: Int) <- receiveChan rport
816+ \rport -> (receiveChan rport :: Process Int) >>= send us
757 send pid sport
818 send pid sport
759− liftIO $ putMVar done ()
819+ expect >>= liftIO . putMVar done
761− takeMVar done
821+ res <- takeMVar done
822+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
763testSpawnAsyncStrictness :: TestTransport -> Assertion
824testSpawnAsyncStrictness :: TestTransport -> Assertion
764testSpawnAsyncStrictness TestTransport{..} = do
825testSpawnAsyncStrictness TestTransport{..} = do
@@ -787,8 +848,9 @@ testReconnect TestTransport{..} = do
787 liftIO $ putMVar processA us
848 liftIO $ putMVar processA us
788 msg1 <- expect
849 msg1 <- expect
789 msg2 <- expect
850 msg2 <- expect
790− True <- return $ msg1 == "message 1" && msg2 == "message 3"
852+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
791− liftIO $ putMVar sendTestOk ()
853+ putMVar sendTestOk ()
793 forkProcess node2 $ do
855 forkProcess node2 $ do
@@ -821,7 +883,7 @@ testReconnect TestTransport{..} = do
821 matchIf (\(RegisterReply label' _ _) -> "a" == label')
883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
822 (\(RegisterReply _ _ _) -> return ()) ]
884 (\(RegisterReply _ _ _) -> return ()) ]
824− Just _ <- whereisRemote nid1 "a"
886+ _ <- whereisRemote nid1 "a"
827 -- Simulate network failure
889 -- Simulate network failure
@@ -840,9 +902,10 @@ testReconnect TestTransport{..} = do
840 (\(RegisterReply _ _ _) -> return ()) ]
902 (\(RegisterReply _ _ _) -> return ()) ]
843− Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
905+ mPid <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
906+ liftIO $ assertBool "Expected remote name to be lost" $ mPid == Nothing
844− Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
907+ verifyWhereIsRemote nid1 "b" -- this will suceed because the value is set after thereconnect
845− Just _ <- whereisRemote nid1 "c"
908+ verifyWhereIsRemote nid1 "c"
847 liftIO $ putMVar registerTestOk ()
910 liftIO $ putMVar registerTestOk ()
@@ -883,19 +946,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
883 isSorted _ = True
946 isSorted _ = True
884 -- The list can't be null since there are no failures after sending
947 -- The list can't be null since there are no failures after sending
885 -- the last message.
948 -- the last message.
886− True <- return $ isSorted msgs && not (null msgs)
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
887− liftIO $ putMVar usendTestOk ()
889 forkProcess node2 $ do
951 forkProcess node2 $ do
890 them <- liftIO $ readMVar processA
952 them <- liftIO $ readMVar processA
891 getSelfPid >>= send them
953 getSelfPid >>= send them
892− () <- expect
954+ expect :: Process ()
893 forM_ [1..numMessages] $ \i -> do
955 forM_ [1..numMessages] $ \i -> do
894 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
895 usendPrim them i
957 usendPrim them i
896 liftIO (threadDelay 30000)
958 liftIO (threadDelay 30000)
898− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
900-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
901-- in between
964-- in between
@@ -921,14 +984,17 @@ testMatchAny TestTransport{..} = do
921 runProcess localNode $ do
984 runProcess localNode $ do
922 pid <- getSelfPid
985 pid <- getSelfPid
923 send mathServer (Add pid 1 2)
986 send mathServer (Add pid 1 2)
924− 3 <- expect :: Process Double
987+ three <- expect :: Process Double
925 send mathServer (Divide pid 8 2)
988 send mathServer (Divide pid 8 2)
926− 4 <- expect :: Process Double
989+ four <- expect :: Process Double
927 send mathServer (Divide pid 8 0)
990 send mathServer (Divide pid 8 0)
928− DivByZero <- expect
991+ divByZ <- expect
929− liftIO $ putMVar clientDone ()
992+ liftIO $ putMVar clientDone (three, four, divByZ)
931− takeMVar clientDone
994+ res <- takeMVar clientDone
996+ (3, 4, DivByZero) -> return ()
997+ _ -> error "Unexpected result"
933-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
934-- in between, however we block 'Divide' requests ....
1000-- in between, however we block 'Divide' requests ....
@@ -955,12 +1021,13 @@ testMatchAnyHandle TestTransport{..} = do
955 runProcess localNode $ do
1021 runProcess localNode $ do
956 pid <- getSelfPid
1022 pid <- getSelfPid
957 send mathServer (Add pid 1 2)
1023 send mathServer (Add pid 1 2)
958− 3 <- expect :: Process Double
1024+ three <- expect :: Process Double
959 send mathServer (Divide pid 8 2)
1025 send mathServer (Divide pid 8 2)
960− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1026+ res <- (expectTimeout 100000) :: Process (Maybe Double)
961− liftIO $ putMVar clientDone ()
1027+ liftIO $ putMVar clientDone $ three == 3 && res == Nothing
1029+ verifyClient "Expected Nothing (i.e. timeout)" clientDone
964 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
965 maybeForward s msg =
1032 maybeForward s msg =
966 handleMessage msg (\m@(Add _ _ _) -> send s m)
1033 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -988,8 +1055,10 @@ testMatchAnyNoHandle TestTransport{..} = do
988 Just _ -> die "NONSENSE")
1055 Just _ -> die "NONSENSE")
990 -- we *must* have removed the message from our mailbox though!!!
1057 -- we *must* have removed the message from our mailbox though!!!
991− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1058+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1060+ assertBool "Expected timeout!" $ res == Nothing
992− liftIO $ putMVar serverDone ()
1061+ putMVar serverDone ()
993 putMVar addr server
1062 putMVar addr server
995 -- Client
1064 -- Client
@@ -1032,14 +1101,21 @@ testMatchAnyIf TestTransport{..} = do
1032 runProcess localNode $ do
1101 runProcess localNode $ do
1033 pid <- getSelfPid
1102 pid <- getSelfPid
1034 send server (pid, "foo")
1103 send server (pid, "foo")
1035− "foo" <- expect
1104+ foo <- expect
1036− send server (pid, "baz")
1105+ -- provoking what would be the wrong ordering is informative here...
1037− "baz" <- expect
1106+
1038 send server (pid, "bar")
1107 send server (pid, "bar")
1039− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1108+ bar <- (expectTimeout 100000) :: Process (Maybe String) -- was Double o_O !?
1110+ send server (pid, "baz")
1040− liftIO $ putMVar clientDone ()
1113+ liftIO $ putMVar clientDone (foo, bar, baz)
1115+ res <- takeMVar clientDone
1116+ let res' = res == ("foo", Nothing, "baz")
1117+ assertBool "Expected timeout due to type mismatch" res'
1042− takeMVar clientDone
1043 where tryHandleMessage :: Message -> Process (Maybe ())
1119 where tryHandleMessage :: Message -> Process (Maybe ())
1044 tryHandleMessage msg =
1120 tryHandleMessage msg =
1045 handleMessage msg (\(pid :: ProcessId, (m :: String))
1121 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1072,12 +1148,13 @@ testMatchMessageWithUnwrap TestTransport{..} = do
1072 runProcess localNode $ do
1148 runProcess localNode $ do
1073 pid <- getSelfPid
1149 pid <- getSelfPid
1074 send server (pid, wrapMessage ("foo" :: String))
1150 send server (pid, wrapMessage ("foo" :: String))
1075− "foo" <- expect
1151+ foo <- expect
1076 send server (pid, wrapMessage ("baz" :: String))
1152 send server (pid, wrapMessage ("baz" :: String))
1077− "baz" <- expect
1153+ baz <- expect
1078− liftIO $ putMVar clientDone ()
1154+ liftIO $ putMVar clientDone (foo, baz)
1080− takeMVar clientDone
1156+ res <- takeMVar clientDone
1157+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1082-- Test 'receiveChanTimeout'
1159-- Test 'receiveChanTimeout'
1083testReceiveChanTimeout :: TestTransport -> Assertion
1160testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1095,18 +1172,19 @@ testReceiveChanTimeout TestTransport{..} = do
1096 -- Wait for a message with a delay. No message arrives, we should get
1173 -- Wait for a message with a delay. No message arrives, we should get
1097 -- Nothing after the delay.
1174 -- Nothing after the delay.
1098− Nothing <- receiveChanTimeout 100000 rp
1175+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1100 -- Let the sender know that it can send a message.
1177 -- Let the sender know that it can send a message.
1101 liftIO $ putMVar mvSender ()
1178 liftIO $ putMVar mvSender ()
1103 -- Wait for a message with a delay again. Now a message arrives after
1180 -- Wait for a message with a delay again. Now a message arrives after
1104 -- 0.1 seconds
1181 -- 0.1 seconds
1105− Just True <- receiveChanTimeout 20000000 rp
1182+ res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1183+ liftIO $ assertBool "Expected result to be 'True'" res
1107 -- Wait for a message with zero timeout: non-blocking check. No message is
1185 -- Wait for a message with zero timeout: non-blocking check. No message is
1108 -- available, we get Nothing
1186 -- available, we get Nothing
1109− Nothing <- receiveChanTimeout 0 rp
1187+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1111 -- Let the sender know that it can send a message.
1189 -- Let the sender know that it can send a message.
1112 liftIO $ putMVar mvSender ()
1190 liftIO $ putMVar mvSender ()
@@ -1116,7 +1194,7 @@ testReceiveChanTimeout TestTransport{..} = do
1116 liftIO $ threadDelay 100000
1194 liftIO $ threadDelay 100000
1117 mb <- receiveChanTimeout 0 rp
1195 mb <- receiveChanTimeout 0 rp
1118 case mb of
1196 case mb of
1119− Just b -> do False <- return b; return ()
1197+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1120 _ -> loop
1198 _ -> loop
1122 liftIO $ putMVar done ()
1200 liftIO $ putMVar done ()
@@ -1153,8 +1231,8 @@ testReceiveChanFeatures TestTransport{..} = do
1154 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1156− True <- receiveChan rp1
1234+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1157− False <- receiveChan rp1
1235+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1159 -- Test Applicative instance
1237 -- Test Applicative instance
@@ -1163,7 +1241,7 @@ testReceiveChanFeatures TestTransport{..} = do
1164 let rp2 = pure (+) <*> rpInt <*> rpInt
1242 let rp2 = pure (+) <*> rpInt <*> rpInt
1166− 7 <- receiveChan rp2
1244+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1168 -- Test Alternative instance
1246 -- Test Alternative instance
@@ -1172,8 +1250,8 @@ testReceiveChanFeatures TestTransport{..} = do
1173 let rp3 = (even <$> rpInt) <|> rpBool
1251 let rp3 = (even <$> rpInt) <|> rpBool
1175− False <- receiveChan rp3
1253+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1176− True <- receiveChan rp3
1254+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
1178 -- Test Monad instance
1256 -- Test Monad instance
@@ -1187,17 +1265,86 @@ testReceiveChanFeatures TestTransport{..} = do
1187 then rpInt
1265 then rpInt
1188 else return 7
1266 else return 7
1190− 5 <- receiveChan rp4
1268+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1191− 7 <- receiveChan rp4
1269+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1193 liftIO $ putMVar done ()
1271 liftIO $ putMVar done ()
1195 takeMVar done
1273 takeMVar done
1275+testChanLifecycle :: TestTransport -> Assertion
1276+testChanLifecycle TestTransport{..} = let delay = 3000000 in do
1277+ result <- newEmptyMVar
1278+ tchMV <- newEmptyMVar
1279+ localNode <- newLocalNode testTransport initRemoteTable
1280+ runProcess localNode $ do
1282+ pid <- spawnLocal $ do tCh <- newChan :: Process (SendPort (), ReceivePort ())
1283+ liftIO $ putMVar tchMV tCh
1284+ expect :: Process ()
1287+ expect :: Process ()
1289+ mRefPid <- monitor pid
1291+ cPid <- spawnLocal $ do
1292+ (sp', rp) <- liftIO $ takeMVar tchMV
1293+ -- say "picked up our test channel"
1295+ -- say "told pid to continue"
1296+ res <- receiveChanTimeout delay rp
1298+ Nothing -> say "initial chan () missing!" >> (liftIO $ putMVar result False)
1299+ Just () -> do mr <- monitor pid
1301+ -- say "sending pid a second () will cause it to exit"
1304+ -- say "make sure we see a DOWN notification for pid having stopped"
1305+ receiveWait [ match (\(_ :: ProcessMonitorNotification) -> return ()) ]
1307+ -- now that pid has died, the send port should be useless...
1308+ liftIO $ putMVar tchMV (sp', rp)
1310+ -- let's verify that we do not see the message from our
1311+ -- parent process on the channel, once pid has died...
1312+ recv <- receiveChanTimeout delay rp
1313+ -- say $ "finished waiting for second (), writing result" ++ (show recv)
1314+ liftIO $ putMVar result $ isNothing recv
1316+ mRefCPid <- monitor cPid
1319+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefPid)
1323+ -- say "seen first pid die..."
1325+ (sendPort, _) <- liftIO $ takeMVar tchMV
1326+ sendChan sendPort ()
1327+ -- say "sent () after owning pid died"
1329+ -- let cPid know we've written to the channel...
1333+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefCPid)
1337+ -- say "seen both pids die now..."
1339+ -- and wait on the result back in IO land...
1340+ testRes <- takeMVar result
1341+ -- runProcess localNode $ say "got result..."
1342+ assertBool "Expected sending on the channel to fail, but received data!" testRes
1197testKillLocal :: TestTransport -> Assertion
1345testKillLocal :: TestTransport -> Assertion
1198testKillLocal TestTransport{..} = do
1346testKillLocal TestTransport{..} = do
1199 localNode <- newLocalNode testTransport initRemoteTable
1347 localNode <- newLocalNode testTransport initRemoteTable
1200− done <- newEmptyMVar
1202 pid <- forkProcess localNode $ do
1349 pid <- forkProcess localNode $ do
1203 liftIO $ threadDelay 1000000
1350 liftIO $ threadDelay 1000000
@@ -1206,17 +1353,18 @@ testKillLocal TestTransport{..} = do
1206 ref <- monitor pid
1353 ref <- monitor pid
1207 us <- getSelfPid
1354 us <- getSelfPid
1208 kill pid "TestKill"
1355 kill pid "TestKill"
1209− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1356+ mn <- expect
1358+ ProcessMonitorNotification ref' pid' (DiedException ex) ->
1210− True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1359+ case ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill" of
1211− liftIO $ putMVar done ()
1360+ True -> return ()
1212−
1361+ False -> die "Invalid ProcessMonitorNotification received"
1213− takeMVar done
1362+ _ -> die "Something went horribly wrong"
1215testKillRemote :: TestTransport -> Assertion
1364testKillRemote :: TestTransport -> Assertion
1216testKillRemote TestTransport{..} = do
1365testKillRemote TestTransport{..} = do
1217 node1 <- newLocalNode testTransport initRemoteTable
1366 node1 <- newLocalNode testTransport initRemoteTable
1218 node2 <- newLocalNode testTransport initRemoteTable
1367 node2 <- newLocalNode testTransport initRemoteTable
1219− done <- newEmptyMVar
1221 pid <- forkProcess node1 $ do
1369 pid <- forkProcess node1 $ do
1222 liftIO $ threadDelay 1000000
1370 liftIO $ threadDelay 1000000
@@ -1225,11 +1373,17 @@ testKillRemote TestTransport{..} = do
1225 ref <- monitor pid
1373 ref <- monitor pid
1226 us <- getSelfPid
1374 us <- getSelfPid
1227 kill pid "TestKill"
1375 kill pid "TestKill"
1228− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1378+ ProcessMonitorNotification ref' pid' (DiedException reason) ->
1229− True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1379+ case (ref == ref', pid == pid', reason == "killed-by=" ++ show us ++ ",reason=TestKill") of
1230− liftIO $ putMVar done ()
1380+ (True, True, True) -> return ()
1231−
1381+ (a, b, c) -> do
1232− takeMVar done
1382+ let a' = if a then "" else "Invalid ref"
1383+ let b' = if b then "" else "Invalid pid"
1384+ let c' = if c then "" else "Invalid message"
1385+ die $ unwords [a', b', c']
1386+ _ -> die "Received unexpected message"
1234testCatchesExit :: TestTransport -> Assertion
1388testCatchesExit :: TestTransport -> Assertion
1235testCatchesExit TestTransport{..} = do
1389testCatchesExit TestTransport{..} = do
@@ -1255,7 +1409,10 @@ testHandleMessageIf TestTransport{..} = do
1255 self <- getSelfPid
1409 self <- getSelfPid
1256 send self (5 :: Integer, 10 :: Integer)
1410 send self (5 :: Integer, 10 :: Integer)
1257 msg <- receiveWait [ matchMessage return ]
1411 msg <- receiveWait [ matchMessage return ]
1258− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1412+ handleMessageIf msg
1414+ (\() -> die "whoops") >>= maybe (return ())
1415+ (const $ die "Expected Mismatch")
1259 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1260 (\input -> liftIO $ putMVar done input)
1417 (\input -> liftIO $ putMVar done input)
1261 return ()
1418 return ()
@@ -1300,8 +1457,11 @@ testDie TestTransport{..} = do
1300 (die ("foobar", 123 :: Int))
1457 (die ("foobar", 123 :: Int))
1301 `catchExit` \_from reason -> do
1458 `catchExit` \_from reason -> do
1302 -- TODO: should verify that 'from' has the right value
1459 -- TODO: should verify that 'from' has the right value
1303− True <- return $ reason == ("foobar", 123 :: Int)
1460+ let res = reason == ("foobar", 123 :: Int)
1304 liftIO $ putMVar done ()
1461 liftIO $ putMVar done ()
1464+ else die "Something went horribly wrong"
1306 takeMVar done
1466 takeMVar done
@@ -1315,8 +1475,11 @@ testPrettyExit TestTransport{..} = do
1315 `catch` \ex@(ProcessExitException from _) ->
1475 `catch` \ex@(ProcessExitException from _) ->
1316 let expected = "exit-from=" ++ (show from)
1476 let expected = "exit-from=" ++ (show from)
1318− True <- return $ (show ex) == expected
1478+ let res = (show ex) == expected
1319 liftIO $ putMVar done ()
1479 liftIO $ putMVar done ()
1482+ else die "Something went horribly wrong"
1321 takeMVar done
1484 takeMVar done
@@ -1332,17 +1495,26 @@ testExitLocal TestTransport{..} = do
1332 pid <- forkProcess localNode $ do
1495 pid <- forkProcess localNode $ do
1333 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1334 -- TODO: should verify that 'from' has the right value
1497 -- TODO: should verify that 'from' has the right value
1335− True <- return $ reason == "TestExit"
1498+ res <- return $ reason == "TestExit"
1336 liftIO $ putMVar supervisedDone ()
1499 liftIO $ putMVar supervisedDone ()
1502+ else die "Something went horribly wrong"
1338 runProcess localNode $ do
1504 runProcess localNode $ do
1339 liftIO $ takeMVar handlerSetUp
1505 liftIO $ takeMVar handlerSetUp
1340 ref <- monitor pid
1506 ref <- monitor pid
1341 exit pid "TestExit"
1507 exit pid "TestExit"
1342 -- This time the client catches the exception, so it dies normally
1508 -- This time the client catches the exception, so it dies normally
1343− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1511+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1344− True <- return $ ref == ref' && pid == pid'
1512+ let res = ref == ref' && pid == pid'
1345− liftIO $ putMVar supervisorDone ()
1513+ liftIO $ putMVar supervisorDone ()
1516+ else die "Something went horribly wrong"
1517+ _ -> die "Something went horribly wrong"
1347 takeMVar supervisedDone
1519 takeMVar supervisedDone
1348 takeMVar supervisorDone
1520 takeMVar supervisorDone
@@ -1358,125 +1530,97 @@ testExitRemote TestTransport{..} = do
1358 (receiveWait [] :: Process ()) -- block forever
1530 (receiveWait [] :: Process ()) -- block forever
1359 `catchExit` \_from reason -> do
1531 `catchExit` \_from reason -> do
1360 -- TODO: should verify that 'from' has the right value
1532 -- TODO: should verify that 'from' has the right value
1361− True <- return $ reason == "TestExit"
1533+ res <- return $ reason == "TestExit"
1362 liftIO $ putMVar supervisedDone ()
1534 liftIO $ putMVar supervisedDone ()
1537+ else die "Something went horribly wrong"
1364 runProcess node2 $ do
1539 runProcess node2 $ do
1365 ref <- monitor pid
1540 ref <- monitor pid
1366 exit pid "TestExit"
1541 exit pid "TestExit"
1367− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1544+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1368− True <- return $ ref == ref' && pid == pid'
1545+ res' <- return $ ref == ref' && pid == pid'
1369− liftIO $ putMVar supervisorDone ()
1546+ liftIO $ putMVar supervisorDone ()
1549+ else die "Something went horribly wrong"
1550+ _ -> die "Something went horribly wrong"
1371 takeMVar supervisedDone
1552 takeMVar supervisedDone
1372 takeMVar supervisorDone
1553 takeMVar supervisorDone
1374testRegistryMonitoring :: TestTransport -> Assertion
1555testRegistryMonitoring :: TestTransport -> Assertion
1375testRegistryMonitoring TestTransport{..} = do
1556testRegistryMonitoring TestTransport{..} = do
1376− localNode <- newLocalNode testTransport initRemoteTable
1557+ node1 <- newLocalNode testTransport initRemoteTable
1377− remoteNode <- newLocalNode testTransport initRemoteTable
1558+ node2 <- newLocalNode testTransport initRemoteTable
1380− -- Local process. Test if local process will be removed from
1560+ let nid = localNodeId node2
1381− -- registry when it dies.
1561+ pid <- forkProcess node1 $ do
1382− box <- newEmptyMVar
1562+ self <- getSelfPid
1383− runProcess localNode $ do
1563+ runUntilRegistered nid self
1384− pid <- spawnLocal $ do
1564+ say $ (show self) ++ " registered as " ++ regName
1385− expect
1565+ expect :: Process ()
1386− register "test" pid
1566+ say $ (show self) ++ " exiting normally"
1387− tpid <- whereis "test"
1388− if tpid == Just pid
1389− then do _ <- monitor pid
1391− ProcessMonitorNotification{} <- expect
1392− tpid1 <- whereis "test"
1393− liftIO $ putMVar box (Nothing == tpid1)
1394− else liftIO $ putMVar box False
1396− takeMVar box >>= assertBool "expected local process to not be registered"
1399− -- Remote process. Test if remote process entry is removed
1400− -- from registry when process dies.
1401− remote1 <- testRemote remoteNode
1402− runProcess localNode $
1404− w <- whereis "test" :: Process (Maybe ProcessId)
1405− forM_ w (const waitpoll)
1406− in do register "test" remote1
1412− -- Many labels. Test if all labels associated with process
1413− -- are removed from registry when it dies.
1414− remote2 <- testRemote remoteNode
1415− runProcess localNode $
1417− w1 <- whereis "test-3" :: Process (Maybe ProcessId)
1418− w2 <- whereis "test-4" :: Process (Maybe ProcessId)
1419− forM_ (w1 <|> w2) (const waitpoll)
1420− in do register "test-3" remote2
1421− register "test-4" remote2
1426−{- XXX: waiting including patch for nsend for remote process
1427− remote3 <- testRemote remoteNode
1428− remote4 <- testRemote remoteNode
1429− -- test many labels
1430− runProcess localNode $ do
1431− register "test-3" remote3
1432− reregister "test-3" remote4
1434− liftIO $ threadDelay 50000 -- XXX: racy
1437− ProcessMonitorNotification{} <- expect
1441− -- Test registerRemoteAsync properties. Add a local process to
1442− -- remote registry and checks that it is removed
1443− -- when the process dies.
1444− remote5 <- testRemote remoteNode
1445− runProcess localNode $ do
1446− registerRemoteAsync (localNodeId remoteNode) "test" remote5
1448− match (\(RegisterReply _ True _) -> return ())
1451− whereisRemoteAsync (localNodeId remoteNode) "test"
1453− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1457− -- Add remote process to remote registry and checks if
1568+ runProcess node2 $ do
1458− -- entry is removed then process is dead.
1569+ register regName pid
1459− remote6 <- testRemote localNode
1570+ say $ regName ++ " registered to " ++ show pid
1460− runProcess localNode $ do
1571+ res <- whereis regName
1461− registerRemoteAsync (localNodeId remoteNode) "test" remote6
1572+ send pid ()
1462− receiveWait [
1573+ say $ " sent finish signal to " ++ show pid
1463− match (\(RegisterReply _ True _) -> return ())
1574+ us <- getSelfPid
1464− ] >>= send remote6
1575+ liftIO $ assertBool "expected (Just pid)" $ res == (Just pid)
1465− let waitpoll = do
1576+
1466− whereisRemoteAsync (localNodeId remoteNode) "test"
1577+
1467− receiveWait [
1578+ -- This delay isn't essential!
1468− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1579+ -- The test case passes perfectly fine without it (feel free to comment out
1469− ]
1580+ -- and see), however waiting a few seconds here, makes it much more likely
1470− waitpoll
1581+ -- that in delayUntilMaybeUnregistered we will hit the match case right
1471− where
1582+ -- away, and thus not be subjected to a 20 second delay. The value of 4
1472− testRemote node = do
1583+ -- seconds appears to work optimally on osx and across several linux distros
1473− -- test many labels
1584+ -- running in virtual machines (which is essentially what we do in CI)
1474− pidBox <- newEmptyMVar
1585+ void $ receiveTimeout 4000000 [ matchAny return ]
1475− forkProcess node $ do
1586+
1476− us <- getSelfPid
1587+ -- This delay doesn't serve much purpose in the happy path, however if some
1477− liftIO $ putMVar pidBox us
1588+ -- future patch breaks the cooperative behaviour of node controllers viz
1478− expect :: Process ()
1589+ -- remote process registration and notification taking place via ncEffectDied,
1590+ -- there would be the possibility of a race in the test case should we attempt
1591+ -- to evaluate `whereis regName` on node2 right away. In case the name is still
1592+ -- erroneously registered, observing the 20 second delay (or lack of), could at
1593+ -- least give a hint that something is wrong, and we give up our time slice
1594+ -- so that there's a higher change the registrations have been cleaned up
1596+ runProcess node2 $ delayUntilMaybeUnregistered nid pid
1598+ regHere <- newEmptyMVar
1599+ runProcess node2 $ whereis regName >>= liftIO . putMVar regHere
1479− takeMVar pidBox
1600+ res <- takeMVar regHere
1602+ Nothing -> return ()
1603+ Just pid -> assertBool ("expected Nothing, but got " ++ show pid) False
1606+ runUntilRegistered nid us = do
1607+ whereisRemoteAsync nid regName
1609+ matchIf (\(WhereIsReply n (Just p)) -> n == regName && p == us)
1610+ (const $ return ())
1613+ delayUntilMaybeUnregistered nid p = do
1614+ whereisRemoteAsync nid regName
1615+ res <- receiveTimeout 20000000 {- 20 sec delay -} [
1616+ matchIf (\(WhereIsReply n p) -> n == regName && isNothing p)
1617+ (const $ return ())
1620+ Just () -> return ()
1621+ Nothing -> delayUntilMaybeUnregistered nid p
1623+ regName = "testRegisterRemote"
1481testUnsafeSend :: TestTransport -> Assertion
1625testUnsafeSend :: TestTransport -> Assertion
1482testUnsafeSend TestTransport{..} = do
1626testUnsafeSend TestTransport{..} = do
@@ -1493,8 +1637,7 @@ testUnsafeSend TestTransport{..} = do
1493 void $ forkProcess localNode $ do
1637 void $ forkProcess localNode $ do
1494 serverPid <- liftIO $ takeMVar serverAddr
1638 serverPid <- liftIO $ takeMVar serverAddr
1495 getSelfPid >>= unsafeSend serverPid
1639 getSelfPid >>= unsafeSend serverPid
1497− liftIO $ putMVar clientDone ()
1640+ expect >>= liftIO . putMVar clientDone
1499 takeMVar clientDone
1642 takeMVar clientDone
@@ -1513,8 +1656,7 @@ testUnsafeUSend TestTransport{..} = do
1513 void $ forkProcess localNode $ do
1656 void $ forkProcess localNode $ do
1514 serverPid <- liftIO $ takeMVar serverAddr
1657 serverPid <- liftIO $ takeMVar serverAddr
1515 getSelfPid >>= unsafeUSend serverPid
1658 getSelfPid >>= unsafeUSend serverPid
1517− liftIO $ putMVar clientDone ()
1659+ expect >>= liftIO . putMVar clientDone
1519 takeMVar clientDone
1661 takeMVar clientDone
@@ -1525,8 +1667,7 @@ testUnsafeNSend TestTransport{..} = do
1525 localNode <- newLocalNode testTransport initRemoteTable
1667 localNode <- newLocalNode testTransport initRemoteTable
1527 pid <- forkProcess localNode $ do
1669 pid <- forkProcess localNode $ do
1529− liftIO $ putMVar clientDone ()
1670+ expect >>= liftIO . putMVar clientDone
1531 void $ runProcess localNode $ do
1672 void $ runProcess localNode $ do
1532 register "foobar" pid
1673 register "foobar" pid
@@ -1544,8 +1685,7 @@ testUnsafeNSendRemote TestTransport{..} = do
1544 _ <- forkProcess localNode1 $ do
1685 _ <- forkProcess localNode1 $ do
1545 getSelfPid >>= register "foobar"
1686 getSelfPid >>= register "foobar"
1546 liftIO $ putMVar clientDone ()
1687 liftIO $ putMVar clientDone ()
1548− liftIO $ putMVar clientDone ()
1688+ expect >>= liftIO . putMVar clientDone
1550 takeMVar clientDone
1690 takeMVar clientDone
1551 void $ runProcess localNode2 $ do
1691 void $ runProcess localNode2 $ do
@@ -1569,7 +1709,7 @@ testUnsafeSendChan TestTransport{..} = do
1569 serverPid <- liftIO $ takeMVar serverAddr
1709 serverPid <- liftIO $ takeMVar serverAddr
1570 (sp, rp) <- newChan
1710 (sp, rp) <- newChan
1571 unsafeSend serverPid sp
1711 unsafeSend serverPid sp
1572− () <- receiveChan rp
1712+ receiveChan rp :: Process ()
1573 liftIO $ putMVar clientDone ()
1713 liftIO $ putMVar clientDone ()
1575 takeMVar clientDone
1715 takeMVar clientDone
@@ -1583,8 +1723,8 @@ testCallLocal TestTransport{..} = do
1583 runProcess node $ do
1723 runProcess node $ do
1584 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1585 liftIO $ putMVar result r
1725 liftIO $ putMVar result r
1586− True <- takeMVar result
1727+ takeMVar result >>= assertBool "Expected 'True'"
1589 -- Testing that when callLocal is interrupted, the worker is interrupted.
1729 -- Testing that when callLocal is interrupted, the worker is interrupted.
1590 ibox <- newIORef False
1730 ibox <- newIORef False
@@ -1601,10 +1741,9 @@ testCallLocal TestTransport{..} = do
1601 (send keeper ())
1741 (send keeper ())
1602 caller <- expect
1742 caller <- expect
1603 exit caller "test"
1743 exit caller "test"
1604− () <- expect
1744+ expect :: Process ()
1606− True <- readIORef ibox
1746+ readIORef ibox >>= assertBool "Expected 'True'"
1609 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
1748 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
1610 ibox2 <- newIORef False
1749 ibox2 <- newIORef False
@@ -1613,8 +1752,8 @@ testCallLocal TestTransport{..} = do
1613 liftIO $ writeIORef ibox2 $ case r of
1752 liftIO $ writeIORef ibox2 $ case r of
1614 Left (ErrorCall "e") -> True
1753 Left (ErrorCall "e") -> True
1615 _ -> False
1754 _ -> False
1616− True <- readIORef ibox
1756+ readIORef ibox >>= assertBool "Expected 'True'"
1619 -- Test that caller waits for the worker in correct situation
1758 -- Test that caller waits for the worker in correct situation
1620 ibox3 <- newIORef False
1759 ibox3 <- newIORef False
@@ -1631,8 +1770,8 @@ testCallLocal TestTransport{..} = do
1631 liftIO $ putMVar result3 =<< readIORef ibox3
1770 liftIO $ putMVar result3 =<< readIORef ibox3
1632 worker <- expect
1771 worker <- expect
1633 send worker ()
1772 send worker ()
1634− True <- takeMVar result3
1774+ takeMVar result3 >>= assertBool "Expected 'True'"
1637 -- Test that caller waits for the worker in case when caller gets an exception
1776 -- Test that caller waits for the worker in case when caller gets an exception
1638 ibox4 <- newIORef False
1777 ibox4 <- newIORef False
@@ -1648,13 +1787,9 @@ testCallLocal TestTransport{..} = do
1648 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1649 caller <- expect
1788 caller <- expect
1650 exit caller "hi!"
1789 exit caller "hi!"
1651− True <- takeMVar result4
1653− -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1791+ takeMVar result4 >>= assertBool "Expected 'True'"
1792+ -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1659tests :: TestTransport -> IO [Test]
1794tests :: TestTransport -> IO [Test]
1660tests testtrans = return [
1795tests testtrans = return [
@@ -1679,6 +1814,7 @@ tests testtrans = return [
1679 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
1814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
1680 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
1815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
1681 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
1682 , testCase "KillLocal" (testKillLocal testtrans)
1818 , testCase "KillLocal" (testKillLocal testtrans)
1683 , testCase "KillRemote" (testKillRemote testtrans)
1819 , testCase "KillRemote" (testKillRemote testtrans)
1684 , testCase "Die" (testDie testtrans)
1820 , testCase "Die" (testDie testtrans)
@@ -1688,7 +1824,7 @@ tests testtrans = return [
1688 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
1824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
1689 , testCase "ExitLocal" (testExitLocal testtrans)
1825 , testCase "ExitLocal" (testExitLocal testtrans)
1690 , testCase "ExitRemote" (testExitRemote testtrans)
1826 , testCase "ExitRemote" (testExitRemote testtrans)
1691− , testCase "TestRegistryMonitor" (testRegistryMonitoring testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
1692 , testCase "TextCallLocal" (testCallLocal testtrans)
1828 , testCase "TextCallLocal" (testCallLocal testtrans)
1693 -- Unsafe Primitives
1829 -- Unsafe Primitives
1694 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
1830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1741,17 +1877,3 @@ tests testtrans = return [
1741 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1745−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1746−syncBreakConnection breakConnection nid0 nid1 = do
1748− _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1749− runProcess nid0 $ do
1750− them <- liftIO $ takeMVar m
1751− pinger <- spawnLocal $ forever $ send them ()
1752− _ <- monitorNode (localNodeId nid1)
1753− liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1754− (nodeAddress $ localNodeId nid1)
1755− NodeMonitorNotification _ _ _ <- expect
1756− kill pinger "finished"