@@ -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,13 +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
42−import Control.Distributed.Process.Tests.Internal.Utils (shouldBe)
47+import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
43import Control.Distributed.Process.Serializable (Serializable)
48import Control.Distributed.Process.Serializable (Serializable)
44−
49+import Data.Maybe (isNothing, isJust)
45−import Test.HUnit (Assertion, assertFailure, assertBool)
50+import Test.HUnit (Assertion, assertBool, assertFailure)
46import Test.Framework (Test, testGroup)
51import Test.Framework (Test, testGroup)
47import Test.Framework.Providers.HUnit (testCase)
52import Test.Framework.Providers.HUnit (testCase)
48−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
49import Control.Rematch.Run (Match(..))
54import Control.Rematch.Run (Match(..))
51newtype Ping = Ping ProcessId
56newtype Ping = Ping ProcessId
@@ -68,7 +73,7 @@ expectThat a matcher = case res of
68forkTry :: IO () -> IO ThreadId
73forkTry :: IO () -> IO ThreadId
69forkTry p = do
74forkTry p = do
70 tid <- myThreadId
75 tid <- myThreadId
71− forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
76+ forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
73-- | The ping server from the paper
78-- | The ping server from the paper
74ping :: Process ()
79ping :: Process ()
@@ -78,12 +83,46 @@ ping = do
78 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
81-- | Quick and dirty synchronous version of whereisRemoteAsync
94-- | Quick and dirty synchronous version of whereisRemoteAsync
82whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
95whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
83whereisRemote nid string = do
96whereisRemote nid string = do
84 whereisRemoteAsync nid string
97 whereisRemoteAsync nid string
85− 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"
86− return mPid
125+ return ()
88data Add = Add ProcessId Double Double deriving (Typeable)
127data Add = Add ProcessId Double Double deriving (Typeable)
89data Divide = Divide ProcessId Double Double deriving (Typeable)
128data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -158,12 +197,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
158 unmonitor ref
197 unmonitor ref
159 liftIO $ putMVar done ()
198 liftIO $ putMVar done ()
160 (False, ref) -> do
199 (False, ref) -> do
161− ProcessMonitorNotification ref' pid reason' <- expect
201+ match (\(ProcessMonitorNotification ref' pid reason') -> do
203+ assertBool "Bad Monitor Signal"
162− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
204+ (Just ref' == ref && pid == theirAddr &&
205+ mOrL && reason == reason')
163− liftIO $ putMVar done ()
206+ putMVar done ())
165 (\(ProcessLinkException pid reason') -> do
209 (\(ProcessLinkException pid reason') -> do
210+ (liftIO $ assertBool "link exception unmatched" $
166− True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
211+ pid == theirAddr && not mOrL && not un && reason == reason')
167 liftIO $ putMVar done ()
212 liftIO $ putMVar done ()
@@ -194,8 +239,10 @@ testPing TestTransport{..} = do
194 pid <- getSelfPid
239 pid <- getSelfPid
195 replicateM_ numPings $ do
240 replicateM_ numPings $ do
196 send pingServer (Pong pid)
241 send pingServer (Pong pid)
197− Ping _ <- expect
242+ p <- expectTimeout 3000000
198− return ()
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
200 putMVar clientDone ()
247 putMVar clientDone ()
@@ -282,7 +329,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
282 runProcess localNode $ do
329 runProcess localNode $ do
283 monitor theirAddr
330 monitor theirAddr
284 -- wait for the process to die
331 -- wait for the process to die
285− ProcessMonitorNotification _ _ _ <- expect
332+ expect :: Process ProcessMonitorNotification
286 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
288 takeMVar done
335 takeMVar done
@@ -356,14 +403,17 @@ testMath TestTransport{..} = do
356 runProcess localNode $ do
403 runProcess localNode $ do
357 pid <- getSelfPid
404 pid <- getSelfPid
358 send mathServer (Add pid 1 2)
405 send mathServer (Add pid 1 2)
359− 3 <- expect :: Process Double
406+ three <- expect :: Process Double
360 send mathServer (Divide pid 8 2)
407 send mathServer (Divide pid 8 2)
361− 4 <- expect :: Process Double
408+ four <- expect :: Process Double
362 send mathServer (Divide pid 8 0)
409 send mathServer (Divide pid 8 0)
363− DivByZero <- expect
410+ divByZ <- expect
364− liftIO $ putMVar clientDone ()
411+ liftIO $ putMVar clientDone (three, four, divByZ)
366− takeMVar clientDone
413+ res <- takeMVar clientDone
415+ (3, 4, DivByZero) -> return ()
416+ _ -> error $ "Something went horribly wrong"
368-- | Send first message (i.e. connect) to an already terminated process
418-- | Send first message (i.e. connect) to an already terminated process
369-- (without monitoring); then send another message to a second process on
419-- (without monitoring); then send another message to a second process on
@@ -391,11 +441,9 @@ testSendToTerminated TestTransport{..} = do
391 pid <- getSelfPid
441 pid <- getSelfPid
392 send server1 "Hi"
442 send server1 "Hi"
393 send server2 (Pong pid)
443 send server2 (Pong pid)
395− True <- return $ pid' == server2
396− liftIO $ putMVar clientDone ()
444+ expectPing clientDone
398− takeMVar clientDone
446+ verifyClient "Expected Ping from server" clientDone
400-- | Test (non-zero) timeout
448-- | Test (non-zero) timeout
401testTimeout :: TestTransport -> Assertion
449testTimeout :: TestTransport -> Assertion
@@ -404,10 +452,10 @@ testTimeout TestTransport{..} = do
404 done <- newEmptyMVar
452 done <- newEmptyMVar
406 runProcess localNode $ do
454 runProcess localNode $ do
407− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
455+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
408− liftIO $ putMVar done ()
456+ liftIO $ putMVar done $ res == Nothing
410− takeMVar done
458+ verifyClient "Expected receiveTimeout to timeout..." done
412-- | Test zero timeout
460-- | Test zero timeout
413testTimeout0 :: TestTransport -> Assertion
461testTimeout0 :: TestTransport -> Assertion
@@ -435,10 +483,9 @@ testTimeout0 TestTransport{..} = do
435 -- 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
436 replicateM_ 10000 $ send server "Irrelevant message"
484 replicateM_ 10000 $ send server "Irrelevant message"
437 send server (Pong pid)
485 send server (Pong pid)
439− liftIO $ putMVar clientDone ()
486+ expectPing clientDone
441− takeMVar clientDone
488+ verifyClient "Expected Ping from server" clientDone
443-- | Test typed channels
490-- | Test typed channels
444testTypedChannels :: TestTransport -> Assertion
491testTypedChannels :: TestTransport -> Assertion
@@ -461,10 +508,10 @@ testTypedChannels TestTransport{..} = do
461 runProcess localNode $ do
508 runProcess localNode $ do
462 (clientSendPort, rport) <- newChan
509 (clientSendPort, rport) <- newChan
463 sendChan serverSendPort (clientSendPort, 5)
510 sendChan serverSendPort (clientSendPort, 5)
464− False <- receiveChan rport
511+ ch <- receiveChan rport
465− liftIO $ putMVar clientDone ()
512+ liftIO $ putMVar clientDone $ ch == False
467− takeMVar clientDone
514+ verifyClient "Expected channel to send 'False'" clientDone
469-- | Test merging receive ports
516-- | Test merging receive ports
470testMergeChannels :: TestTransport -> Assertion
517testMergeChannels :: TestTransport -> Assertion
@@ -487,9 +534,8 @@ testMergeChannels TestTransport{..} = do
487 rs <- mapM charChannel "abc"
534 rs <- mapM charChannel "abc"
488 m <- mergePorts biased rs
535 m <- mergePorts biased rs
489 xs <- replicateM 9 $ receiveChan m
536 xs <- replicateM 9 $ receiveChan m
490− True <- return $ xs == expected
491− liftIO $ putMVar done ()
537+ liftIO $ putMVar done $ xs == expected
492− takeMVar done
538+ verifyClient "Expected single layer merge to match expected ordering" done
494 -- Two layers of merging
540 -- Two layers of merging
495 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -500,9 +546,8 @@ testMergeChannels TestTransport{..} = do
500 ms <- mapM (mergePorts biasedInner) rss
546 ms <- mapM (mergePorts biasedInner) rss
501 m <- mergePorts biasedOuter ms
547 m <- mergePorts biasedOuter ms
502 xs <- replicateM (9 * 3) $ receiveChan m
548 xs <- replicateM (9 * 3) $ receiveChan m
503− True <- return $ xs == expected
549+ liftIO $ putMVar done $ xs == expected
504− liftIO $ putMVar done ()
550+ verifyClient "Expected nested channels to match expeted ordering" done
507 -- 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
508 testBlocked :: LocalNode -> Bool -> IO ()
553 testBlocked :: LocalNode -> Bool -> IO ()
@@ -511,43 +556,45 @@ testMergeChannels TestTransport{..} = do
511 done <- newEmptyMVar
556 done <- newEmptyMVar
513 forkProcess localNode $ do
558 forkProcess localNode $ do
514− [sa, sb, sc] <- liftIO $ mapM readMVar vs
559+ ss <- liftIO $ mapM readMVar vs
515− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
562+ mapM_ ((>> pause 10000) . uncurry sendChan)
516− [ -- a, b, c
563+ [ -- a, b, c
517− (sa, 'a')
564+ (sa, 'a')
518− , (sb, 'b')
565+ , (sb, 'b')
519− , (sc, 'c')
566+ , (sc, 'c')
520− -- a, c, b
567+ -- a, c, b
521− , (sa, 'a')
568+ , (sa, 'a')
522− , (sc, 'c')
569+ , (sc, 'c')
523− , (sb, 'b')
570+ , (sb, 'b')
524− -- b, a, c
571+ -- b, a, c
525− , (sb, 'b')
572+ , (sb, 'b')
526− , (sa, 'a')
573+ , (sa, 'a')
527− , (sc, 'c')
574+ , (sc, 'c')
528− -- b, c, a
575+ -- b, c, a
529− , (sb, 'b')
576+ , (sb, 'b')
530− , (sc, 'c')
577+ , (sc, 'c')
531− , (sa, 'a')
578+ , (sa, 'a')
532− -- c, a, b
579+ -- c, a, b
533− , (sc, 'c')
580+ , (sc, 'c')
534− , (sa, 'a')
581+ , (sa, 'a')
535− , (sb, 'b')
582+ , (sb, 'b')
536− -- c, b, a
583+ -- c, b, a
537− , (sc, 'c')
584+ , (sc, 'c')
538− , (sb, 'b')
585+ , (sb, 'b')
539− , (sa, 'a')
586+ , (sa, 'a')
588+ _ -> die "Something went horribly wrong"
542 forkProcess localNode $ do
590 forkProcess localNode $ do
543 (ss, rs) <- unzip <$> replicateM 3 newChan
591 (ss, rs) <- unzip <$> replicateM 3 newChan
544 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
545 m <- mergePorts biased rs
593 m <- mergePorts biased rs
546 xs <- replicateM (6 * 3) $ receiveChan m
594 xs <- replicateM (6 * 3) $ receiveChan m
547− True <- return $ xs == "abcacbbacbcacabcba"
548− liftIO $ putMVar done ()
595+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
550− takeMVar done
597+ verifyClient "Expected merged ports to match expected ordering" done
552 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
553 mergePorts True = mergePortsBiased
600 mergePorts True = mergePortsBiased
@@ -565,8 +612,9 @@ testTerminate TestTransport{..} = do
565 localNode <- newLocalNode testTransport initRemoteTable
612 localNode <- newLocalNode testTransport initRemoteTable
566 runProcess localNode $ do
613 runProcess localNode $ do
567 e <- try terminate :: Process (Either ProcessTerminationException ())
614 e <- try terminate :: Process (Either ProcessTerminationException ())
568− True <- return $ either show show e == show ProcessTerminationException
615+ if either show show e == show ProcessTerminationException
569− return ()
616+ then return ()
617+ else die "Unexpected result from terminate"
571testMonitorNode :: TestTransport -> Assertion
619testMonitorNode :: TestTransport -> Assertion
572testMonitorNode TestTransport{..} = do
620testMonitorNode TestTransport{..} = do
@@ -577,11 +625,12 @@ testMonitorNode TestTransport{..} = do
578 runProcess node2 $ do
626 runProcess node2 $ do
579 ref <- monitorNode (localNodeId node1)
627 ref <- monitorNode (localNodeId node1)
580− NodeMonitorNotification ref' nid DiedDisconnect <- expect
629+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
581− True <- return $ ref == ref' && nid == localNodeId node1
630+ return $ ref == ref' && nid == localNodeId node1)
582− liftIO $ putMVar done ()
631+ ] >>= liftIO . putMVar done
584− takeMVar done
633+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
586testMonitorLiveNode :: TestTransport -> Assertion
635testMonitorLiveNode :: TestTransport -> Assertion
587testMonitorLiveNode TestTransport{..} = do
636testMonitorLiveNode TestTransport{..} = do
@@ -596,15 +645,16 @@ testMonitorLiveNode TestTransport{..} = do
596 liftIO $ putMVar ready ()
645 liftIO $ putMVar ready ()
597 liftIO $ takeMVar readyr
646 liftIO $ takeMVar readyr
598 send p ()
647 send p ()
599− NodeMonitorNotification ref' nid _ <- expect
649+ match (\(NodeMonitorNotification ref' nid _) ->
600− True <- return $ ref == ref' && nid == localNodeId node1
650+ (return $ ref == ref' && nid == localNodeId node1))
601− liftIO $ putMVar done ()
651+ ] >>= liftIO . putMVar done
603 takeMVar ready
653 takeMVar ready
604 closeLocalNode node1
654 closeLocalNode node1
605 putMVar readyr ()
655 putMVar readyr ()
607− takeMVar done
657+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
609testMonitorChannel :: TestTransport -> Assertion
659testMonitorChannel :: TestTransport -> Assertion
610testMonitorChannel TestTransport{..} = do
660testMonitorChannel TestTransport{..} = do
@@ -614,18 +664,20 @@ testMonitorChannel TestTransport{..} = do
614 pid <- forkProcess node1 $ do
664 pid <- forkProcess node1 $ do
615 sport <- expect :: Process (SendPort ())
665 sport <- expect :: Process (SendPort ())
616 ref <- monitorPort sport
666 ref <- monitorPort sport
617− PortMonitorNotification ref' port' reason <- expect
667+ receiveWait [
618− -- 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
619− -- 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 &&
620− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
672+ (reason == DiedNormal || reason == DiedUnknownId))
621− liftIO $ putMVar gotNotification ()
673+ ] >>= liftIO . putMVar gotNotification
623 runProcess node2 $ do
675 runProcess node2 $ do
624 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
625 send pid sport
677 send pid sport
626 liftIO $ threadDelay 100000
678 liftIO $ threadDelay 100000
628− takeMVar gotNotification
680+ verifyClient "Expected PortMonitorNotification" gotNotification
630testRegistry :: TestTransport -> Assertion
682testRegistry :: TestTransport -> Assertion
631testRegistry TestTransport{..} = do
683testRegistry TestTransport{..} = do
@@ -637,20 +689,28 @@ testRegistry TestTransport{..} = do
638 runProcess node $ do
690 runProcess node $ do
639 register "ping" pingServer
691 register "ping" pingServer
640− Just pid <- whereis "ping"
692+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
641− True <- return $ pingServer == pid
642 us <- getSelfPid
693 us <- getSelfPid
643 nsend "ping" (Pong us)
694 nsend "ping" (Pong us)
644− Ping pid' <- expect
695+ receiveWait [
645− True <- return $ pingServer == pid'
696+ matchIf (\(Ping pid') -> pingServer == pid') (const $ return ())
646− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
697+ ]
647− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
698+ checkRegException "dead" Nothing deadProcess
648− True <- return $ x == pingServer
699+ checkRegException "ping" (Just pingServer) deadProcess
649− Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
700+ try (unregister "dead") >>= checkReg "dead" Nothing
650 liftIO $ putMVar done ()
701 liftIO $ putMVar done ()
652 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
654testRegistryRemoteProcess :: TestTransport -> Assertion
714testRegistryRemoteProcess :: TestTransport -> Assertion
655testRegistryRemoteProcess TestTransport{..} = do
715testRegistryRemoteProcess TestTransport{..} = do
656 node1 <- newLocalNode testTransport initRemoteTable
716 node1 <- newLocalNode testTransport initRemoteTable
@@ -661,13 +721,13 @@ testRegistryRemoteProcess TestTransport{..} = do
662 runProcess node2 $ do
722 runProcess node2 $ do
663 register "ping" pingServer
723 register "ping" pingServer
664− Just pid <- whereis "ping"
724+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
665− True <- return $ pingServer == pid
666 us <- getSelfPid
725 us <- getSelfPid
667 nsend "ping" (Pong us)
726 nsend "ping" (Pong us)
668− Ping pid' <- expect
727+ receiveWait [
669− True <- return $ pingServer == pid'
728+ matchIf (\(Ping pid') -> pingServer == pid')
670− liftIO $ putMVar done ()
729+ (const $ liftIO $ putMVar done ())
672 takeMVar done
732 takeMVar done
@@ -675,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
675testRemoteRegistry TestTransport{..} = do
735testRemoteRegistry TestTransport{..} = do
676 node1 <- newLocalNode testTransport initRemoteTable
736 node1 <- newLocalNode testTransport initRemoteTable
677 node2 <- newLocalNode testTransport initRemoteTable
737 node2 <- newLocalNode testTransport initRemoteTable
678− done <- newEmptyMVar
680 pingServer <- forkProcess node1 ping
739 pingServer <- forkProcess node1 ping
681 deadProcess <- forkProcess node1 (return ())
740 deadProcess <- forkProcess node1 (return ())
@@ -688,32 +747,34 @@ testRemoteRegistry TestTransport{..} = do
688 "ping" == label' && pid == pingServer)
747 "ping" == label' && pid == pingServer)
689 (\(RegisterReply _ _ _) -> return ()) ]
748 (\(RegisterReply _ _ _) -> return ()) ]
691− Just pid <- whereisRemote nid1 "ping"
750+ pid <- verifyWhereIsRemote nid1 "ping"
692− True <- return $ pingServer == pid
751+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
693 us <- getSelfPid
753 us <- getSelfPid
694 nsendRemote nid1 "ping" (Pong us)
754 nsendRemote nid1 "ping" (Pong us)
695− Ping pid' <- expect
755+ receiveWait [
696− True <- return $ pingServer == pid'
756+ match (\(Ping pid') -> return $ pingServer == pid')
757+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
698 -- test that if process was not registered Nothing is returned
759 -- test that if process was not registered Nothing is returned
699 -- in owner field.
760 -- in owner field.
700 registerRemoteAsync nid1 "dead" deadProcess
761 registerRemoteAsync nid1 "dead" deadProcess
702− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
762+ receiveWait [ matchIf (\(RegisterReply label' f mPid) -> "dead" == label')
703− (\(RegisterReply _ _ _) -> return ()) ]
763+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
764+ ] >>= liftIO . assertBool "Expected False Nothing in RegisterReply"
704 registerRemoteAsync nid1 "ping" deadProcess
766 registerRemoteAsync nid1 "ping" deadProcess
705 receiveWait [
767 receiveWait [
706− matchIf (\(RegisterReply label' False (Just pid)) ->
768+ matchIf (\(RegisterReply label' False mPid) ->
707− "ping" == label' && pid == pingServer)
769+ "ping" == label' && isJust mPid)
708− (\(RegisterReply _ _ _) -> return ()) ]
770+ (\(RegisterReply _ f (Just pid'')) -> return (not f && pid'' == pingServer))
771+ ] >>= liftIO . assertBool "Expected False and (Just alreadyRegisteredPid) in RegisterReply"
709 unregisterRemoteAsync nid1 "dead"
773 unregisterRemoteAsync nid1 "dead"
710 receiveWait [
774 receiveWait [
711− matchIf (\(RegisterReply label' False Nothing) ->
775+ matchIf (\(RegisterReply label' _ _) -> "dead" == label')
712− "dead" == label' && pid == pingServer)
776+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
713− (\(RegisterReply _ _ _) -> return ()) ]
777+ ] >>= liftIO . assertBool "Expected False and Nothing in RegisterReply"
714− liftIO $ putMVar done ()
718testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
719testRemoteRegistryRemoteProcess TestTransport{..} = do
780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -729,15 +790,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
729 receiveWait [
790 receiveWait [
730 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
731 (\(RegisterReply _ _ _) -> return ()) ]
792 (\(RegisterReply _ _ _) -> return ()) ]
732− Just pid <- whereisRemote nid1 "ping"
793+ pid <- verifyWhereIsRemote nid1 "ping"
733− True <- return $ pingServer == pid
794+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
734 us <- getSelfPid
795 us <- getSelfPid
735 nsendRemote nid1 "ping" (Pong us)
796 nsendRemote nid1 "ping" (Pong us)
736− Ping pid' <- expect
797+ receiveWait [
737− True <- return $ pingServer == pid'
798+ match (\(Ping pid') -> return $ pingServer == pid')
738− liftIO $ putMVar done ()
799+ ] >>= liftIO . putMVar done
740− takeMVar done
801+ verifyClient "Expected Ping with ping server's ProcessId" done
742testSpawnLocal :: TestTransport -> Assertion
803testSpawnLocal :: TestTransport -> Assertion
743testSpawnLocal TestTransport{..} = do
804testSpawnLocal TestTransport{..} = do
@@ -751,15 +812,14 @@ testSpawnLocal TestTransport{..} = do
751 sport <- expect
812 sport <- expect
752 sendChan sport (1234 :: Int)
813 sendChan sport (1234 :: Int)
754− sport <- spawnChannelLocal $ \rport -> do
815+ sport <- spawnChannelLocal $
755− (1234 :: Int) <- receiveChan rport
816+ \rport -> (receiveChan rport :: Process Int) >>= send us
758 send pid sport
818 send pid sport
760− liftIO $ putMVar done ()
819+ expect >>= liftIO . putMVar done
762− takeMVar done
821+ res <- takeMVar done
822+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
764testSpawnAsyncStrictness :: TestTransport -> Assertion
824testSpawnAsyncStrictness :: TestTransport -> Assertion
765testSpawnAsyncStrictness TestTransport{..} = do
825testSpawnAsyncStrictness TestTransport{..} = do
@@ -788,8 +848,9 @@ testReconnect TestTransport{..} = do
788 liftIO $ putMVar processA us
848 liftIO $ putMVar processA us
789 msg1 <- expect
849 msg1 <- expect
790 msg2 <- expect
850 msg2 <- expect
791− True <- return $ msg1 == "message 1" && msg2 == "message 3"
852+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
792− liftIO $ putMVar sendTestOk ()
853+ putMVar sendTestOk ()
794 forkProcess node2 $ do
855 forkProcess node2 $ do
@@ -822,7 +883,7 @@ testReconnect TestTransport{..} = do
822 matchIf (\(RegisterReply label' _ _) -> "a" == label')
883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
823 (\(RegisterReply _ _ _) -> return ()) ]
884 (\(RegisterReply _ _ _) -> return ()) ]
825− Just _ <- whereisRemote nid1 "a"
886+ _ <- whereisRemote nid1 "a"
828 -- Simulate network failure
889 -- Simulate network failure
@@ -841,9 +902,10 @@ testReconnect TestTransport{..} = do
841 (\(RegisterReply _ _ _) -> return ()) ]
902 (\(RegisterReply _ _ _) -> return ()) ]
844− 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
845− 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
846− Just _ <- whereisRemote nid1 "c"
908+ verifyWhereIsRemote nid1 "c"
848 liftIO $ putMVar registerTestOk ()
910 liftIO $ putMVar registerTestOk ()
@@ -884,19 +946,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
884 isSorted _ = True
946 isSorted _ = True
885 -- 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
886 -- the last message.
948 -- the last message.
887− True <- return $ isSorted msgs && not (null msgs)
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
888− liftIO $ putMVar usendTestOk ()
890 forkProcess node2 $ do
951 forkProcess node2 $ do
891 them <- liftIO $ readMVar processA
952 them <- liftIO $ readMVar processA
892 getSelfPid >>= send them
953 getSelfPid >>= send them
893− () <- expect
954+ expect :: Process ()
894 forM_ [1..numMessages] $ \i -> do
955 forM_ [1..numMessages] $ \i -> do
895 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
896 usendPrim them i
957 usendPrim them i
897 liftIO (threadDelay 30000)
958 liftIO (threadDelay 30000)
899− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
901-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
902-- in between
964-- in between
@@ -922,14 +984,17 @@ testMatchAny TestTransport{..} = do
922 runProcess localNode $ do
984 runProcess localNode $ do
923 pid <- getSelfPid
985 pid <- getSelfPid
924 send mathServer (Add pid 1 2)
986 send mathServer (Add pid 1 2)
925− 3 <- expect :: Process Double
987+ three <- expect :: Process Double
926 send mathServer (Divide pid 8 2)
988 send mathServer (Divide pid 8 2)
927− 4 <- expect :: Process Double
989+ four <- expect :: Process Double
928 send mathServer (Divide pid 8 0)
990 send mathServer (Divide pid 8 0)
929− DivByZero <- expect
991+ divByZ <- expect
930− liftIO $ putMVar clientDone ()
992+ liftIO $ putMVar clientDone (three, four, divByZ)
932− takeMVar clientDone
994+ res <- takeMVar clientDone
996+ (3, 4, DivByZero) -> return ()
997+ _ -> error "Unexpected result"
934-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
935-- in between, however we block 'Divide' requests ....
1000-- in between, however we block 'Divide' requests ....
@@ -956,12 +1021,13 @@ testMatchAnyHandle TestTransport{..} = do
956 runProcess localNode $ do
1021 runProcess localNode $ do
957 pid <- getSelfPid
1022 pid <- getSelfPid
958 send mathServer (Add pid 1 2)
1023 send mathServer (Add pid 1 2)
959− 3 <- expect :: Process Double
1024+ three <- expect :: Process Double
960 send mathServer (Divide pid 8 2)
1025 send mathServer (Divide pid 8 2)
961− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1026+ res <- (expectTimeout 100000) :: Process (Maybe Double)
962− liftIO $ putMVar clientDone ()
1027+ liftIO $ putMVar clientDone $ three == 3 && res == Nothing
1029+ verifyClient "Expected Nothing (i.e. timeout)" clientDone
965 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
966 maybeForward s msg =
1032 maybeForward s msg =
967 handleMessage msg (\m@(Add _ _ _) -> send s m)
1033 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -989,8 +1055,10 @@ testMatchAnyNoHandle TestTransport{..} = do
989 Just _ -> die "NONSENSE")
1055 Just _ -> die "NONSENSE")
991 -- we *must* have removed the message from our mailbox though!!!
1057 -- we *must* have removed the message from our mailbox though!!!
992− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1058+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1060+ assertBool "Expected timeout!" $ res == Nothing
993− liftIO $ putMVar serverDone ()
1061+ putMVar serverDone ()
994 putMVar addr server
1062 putMVar addr server
996 -- Client
1064 -- Client
@@ -1033,14 +1101,21 @@ testMatchAnyIf TestTransport{..} = do
1033 runProcess localNode $ do
1101 runProcess localNode $ do
1034 pid <- getSelfPid
1102 pid <- getSelfPid
1035 send server (pid, "foo")
1103 send server (pid, "foo")
1036− "foo" <- expect
1104+ foo <- expect
1037− send server (pid, "baz")
1105+ -- provoking what would be the wrong ordering is informative here...
1038− "baz" <- expect
1106+
1039 send server (pid, "bar")
1107 send server (pid, "bar")
1040− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1108+ bar <- (expectTimeout 100000) :: Process (Maybe String) -- was Double o_O !?
1110+ send server (pid, "baz")
1041− 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'
1043− takeMVar clientDone
1044 where tryHandleMessage :: Message -> Process (Maybe ())
1119 where tryHandleMessage :: Message -> Process (Maybe ())
1045 tryHandleMessage msg =
1120 tryHandleMessage msg =
1046 handleMessage msg (\(pid :: ProcessId, (m :: String))
1121 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1073,12 +1148,13 @@ testMatchMessageWithUnwrap TestTransport{..} = do
1073 runProcess localNode $ do
1148 runProcess localNode $ do
1074 pid <- getSelfPid
1149 pid <- getSelfPid
1075 send server (pid, wrapMessage ("foo" :: String))
1150 send server (pid, wrapMessage ("foo" :: String))
1076− "foo" <- expect
1151+ foo <- expect
1077 send server (pid, wrapMessage ("baz" :: String))
1152 send server (pid, wrapMessage ("baz" :: String))
1078− "baz" <- expect
1153+ baz <- expect
1079− liftIO $ putMVar clientDone ()
1154+ liftIO $ putMVar clientDone (foo, baz)
1081− takeMVar clientDone
1156+ res <- takeMVar clientDone
1157+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1083-- Test 'receiveChanTimeout'
1159-- Test 'receiveChanTimeout'
1084testReceiveChanTimeout :: TestTransport -> Assertion
1160testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1096,18 +1172,19 @@ testReceiveChanTimeout TestTransport{..} = do
1097 -- 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
1098 -- Nothing after the delay.
1174 -- Nothing after the delay.
1099− Nothing <- receiveChanTimeout 100000 rp
1175+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1101 -- Let the sender know that it can send a message.
1177 -- Let the sender know that it can send a message.
1102 liftIO $ putMVar mvSender ()
1178 liftIO $ putMVar mvSender ()
1104 -- 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
1105 -- 0.1 seconds
1181 -- 0.1 seconds
1106− Just True <- receiveChanTimeout 20000000 rp
1182+ res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1183+ liftIO $ assertBool "Expected result to be 'True'" res
1108 -- 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
1109 -- available, we get Nothing
1186 -- available, we get Nothing
1110− Nothing <- receiveChanTimeout 0 rp
1187+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1112 -- Let the sender know that it can send a message.
1189 -- Let the sender know that it can send a message.
1113 liftIO $ putMVar mvSender ()
1190 liftIO $ putMVar mvSender ()
@@ -1117,7 +1194,7 @@ testReceiveChanTimeout TestTransport{..} = do
1117 liftIO $ threadDelay 100000
1194 liftIO $ threadDelay 100000
1118 mb <- receiveChanTimeout 0 rp
1195 mb <- receiveChanTimeout 0 rp
1119 case mb of
1196 case mb of
1120− Just b -> do False <- return b; return ()
1197+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1121 _ -> loop
1198 _ -> loop
1123 liftIO $ putMVar done ()
1200 liftIO $ putMVar done ()
@@ -1154,8 +1231,8 @@ testReceiveChanFeatures TestTransport{..} = do
1155 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1157− True <- receiveChan rp1
1234+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1158− False <- receiveChan rp1
1235+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1160 -- Test Applicative instance
1237 -- Test Applicative instance
@@ -1164,7 +1241,7 @@ testReceiveChanFeatures TestTransport{..} = do
1165 let rp2 = pure (+) <*> rpInt <*> rpInt
1242 let rp2 = pure (+) <*> rpInt <*> rpInt
1167− 7 <- receiveChan rp2
1244+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1169 -- Test Alternative instance
1246 -- Test Alternative instance
@@ -1173,8 +1250,8 @@ testReceiveChanFeatures TestTransport{..} = do
1174 let rp3 = (even <$> rpInt) <|> rpBool
1251 let rp3 = (even <$> rpInt) <|> rpBool
1176− False <- receiveChan rp3
1253+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1177− True <- receiveChan rp3
1254+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
1179 -- Test Monad instance
1256 -- Test Monad instance
@@ -1188,17 +1265,86 @@ testReceiveChanFeatures TestTransport{..} = do
1188 then rpInt
1265 then rpInt
1189 else return 7
1266 else return 7
1191− 5 <- receiveChan rp4
1268+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1192− 7 <- receiveChan rp4
1269+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1194 liftIO $ putMVar done ()
1271 liftIO $ putMVar done ()
1196 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
1198testKillLocal :: TestTransport -> Assertion
1345testKillLocal :: TestTransport -> Assertion
1199testKillLocal TestTransport{..} = do
1346testKillLocal TestTransport{..} = do
1200 localNode <- newLocalNode testTransport initRemoteTable
1347 localNode <- newLocalNode testTransport initRemoteTable
1201− done <- newEmptyMVar
1203 pid <- forkProcess localNode $ do
1349 pid <- forkProcess localNode $ do
1204 liftIO $ threadDelay 1000000
1350 liftIO $ threadDelay 1000000
@@ -1207,17 +1353,18 @@ testKillLocal TestTransport{..} = do
1207 ref <- monitor pid
1353 ref <- monitor pid
1208 us <- getSelfPid
1354 us <- getSelfPid
1209 kill pid "TestKill"
1355 kill pid "TestKill"
1210− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1356+ mn <- expect
1358+ ProcessMonitorNotification ref' pid' (DiedException ex) ->
1211− 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
1212− liftIO $ putMVar done ()
1360+ True -> return ()
1213−
1361+ False -> die "Invalid ProcessMonitorNotification received"
1214− takeMVar done
1362+ _ -> die "Something went horribly wrong"
1216testKillRemote :: TestTransport -> Assertion
1364testKillRemote :: TestTransport -> Assertion
1217testKillRemote TestTransport{..} = do
1365testKillRemote TestTransport{..} = do
1218 node1 <- newLocalNode testTransport initRemoteTable
1366 node1 <- newLocalNode testTransport initRemoteTable
1219 node2 <- newLocalNode testTransport initRemoteTable
1367 node2 <- newLocalNode testTransport initRemoteTable
1220− done <- newEmptyMVar
1222 pid <- forkProcess node1 $ do
1369 pid <- forkProcess node1 $ do
1223 liftIO $ threadDelay 1000000
1370 liftIO $ threadDelay 1000000
@@ -1226,11 +1373,17 @@ testKillRemote TestTransport{..} = do
1226 ref <- monitor pid
1373 ref <- monitor pid
1227 us <- getSelfPid
1374 us <- getSelfPid
1228 kill pid "TestKill"
1375 kill pid "TestKill"
1229− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1378+ ProcessMonitorNotification ref' pid' (DiedException reason) ->
1230− 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
1231− liftIO $ putMVar done ()
1380+ (True, True, True) -> return ()
1232−
1381+ (a, b, c) -> do
1233− 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"
1235testCatchesExit :: TestTransport -> Assertion
1388testCatchesExit :: TestTransport -> Assertion
1236testCatchesExit TestTransport{..} = do
1389testCatchesExit TestTransport{..} = do
@@ -1256,7 +1409,10 @@ testHandleMessageIf TestTransport{..} = do
1256 self <- getSelfPid
1409 self <- getSelfPid
1257 send self (5 :: Integer, 10 :: Integer)
1410 send self (5 :: Integer, 10 :: Integer)
1258 msg <- receiveWait [ matchMessage return ]
1411 msg <- receiveWait [ matchMessage return ]
1259− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1412+ handleMessageIf msg
1414+ (\() -> die "whoops") >>= maybe (return ())
1415+ (const $ die "Expected Mismatch")
1260 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1261 (\input -> liftIO $ putMVar done input)
1417 (\input -> liftIO $ putMVar done input)
1262 return ()
1418 return ()
@@ -1301,8 +1457,11 @@ testDie TestTransport{..} = do
1301 (die ("foobar", 123 :: Int))
1457 (die ("foobar", 123 :: Int))
1302 `catchExit` \_from reason -> do
1458 `catchExit` \_from reason -> do
1303 -- TODO: should verify that 'from' has the right value
1459 -- TODO: should verify that 'from' has the right value
1304− True <- return $ reason == ("foobar", 123 :: Int)
1460+ let res = reason == ("foobar", 123 :: Int)
1305 liftIO $ putMVar done ()
1461 liftIO $ putMVar done ()
1464+ else die "Something went horribly wrong"
1307 takeMVar done
1466 takeMVar done
@@ -1316,8 +1475,11 @@ testPrettyExit TestTransport{..} = do
1316 `catch` \ex@(ProcessExitException from _) ->
1475 `catch` \ex@(ProcessExitException from _) ->
1317 let expected = "exit-from=" ++ (show from)
1476 let expected = "exit-from=" ++ (show from)
1319− True <- return $ (show ex) == expected
1478+ let res = (show ex) == expected
1320 liftIO $ putMVar done ()
1479 liftIO $ putMVar done ()
1482+ else die "Something went horribly wrong"
1322 takeMVar done
1484 takeMVar done
@@ -1333,17 +1495,26 @@ testExitLocal TestTransport{..} = do
1333 pid <- forkProcess localNode $ do
1495 pid <- forkProcess localNode $ do
1334 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1335 -- TODO: should verify that 'from' has the right value
1497 -- TODO: should verify that 'from' has the right value
1336− True <- return $ reason == "TestExit"
1498+ res <- return $ reason == "TestExit"
1337 liftIO $ putMVar supervisedDone ()
1499 liftIO $ putMVar supervisedDone ()
1502+ else die "Something went horribly wrong"
1339 runProcess localNode $ do
1504 runProcess localNode $ do
1340 liftIO $ takeMVar handlerSetUp
1505 liftIO $ takeMVar handlerSetUp
1341 ref <- monitor pid
1506 ref <- monitor pid
1342 exit pid "TestExit"
1507 exit pid "TestExit"
1343 -- This time the client catches the exception, so it dies normally
1508 -- This time the client catches the exception, so it dies normally
1344− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1511+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1345− True <- return $ ref == ref' && pid == pid'
1512+ let res = ref == ref' && pid == pid'
1346− liftIO $ putMVar supervisorDone ()
1513+ liftIO $ putMVar supervisorDone ()
1516+ else die "Something went horribly wrong"
1517+ _ -> die "Something went horribly wrong"
1348 takeMVar supervisedDone
1519 takeMVar supervisedDone
1349 takeMVar supervisorDone
1520 takeMVar supervisorDone
@@ -1359,128 +1530,97 @@ testExitRemote TestTransport{..} = do
1359 (receiveWait [] :: Process ()) -- block forever
1530 (receiveWait [] :: Process ()) -- block forever
1360 `catchExit` \_from reason -> do
1531 `catchExit` \_from reason -> do
1361 -- TODO: should verify that 'from' has the right value
1532 -- TODO: should verify that 'from' has the right value
1362− True <- return $ reason == "TestExit"
1533+ res <- return $ reason == "TestExit"
1363 liftIO $ putMVar supervisedDone ()
1534 liftIO $ putMVar supervisedDone ()
1537+ else die "Something went horribly wrong"
1365 runProcess node2 $ do
1539 runProcess node2 $ do
1366 ref <- monitor pid
1540 ref <- monitor pid
1367 exit pid "TestExit"
1541 exit pid "TestExit"
1368− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1544+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1369− True <- return $ ref == ref' && pid == pid'
1545+ res' <- return $ ref == ref' && pid == pid'
1370− liftIO $ putMVar supervisorDone ()
1546+ liftIO $ putMVar supervisorDone ()
1549+ else die "Something went horribly wrong"
1550+ _ -> die "Something went horribly wrong"
1372 takeMVar supervisedDone
1552 takeMVar supervisedDone
1373 takeMVar supervisorDone
1553 takeMVar supervisorDone
1375testRegistryMonitoring :: TestTransport -> Assertion
1555testRegistryMonitoring :: TestTransport -> Assertion
1376testRegistryMonitoring TestTransport{..} = do
1556testRegistryMonitoring TestTransport{..} = do
1377− localNode <- newLocalNode testTransport initRemoteTable
1557+ node1 <- newLocalNode testTransport initRemoteTable
1378− remoteNode <- newLocalNode testTransport initRemoteTable
1558+ node2 <- newLocalNode testTransport initRemoteTable
1381− -- Local process. Test if local process will be removed from
1560+ let nid = localNodeId node2
1382− -- registry when it dies.
1561+ pid <- forkProcess node1 $ do
1383− box <- newEmptyMVar
1562+ self <- getSelfPid
1384− runProcess localNode $ do
1563+ runUntilRegistered nid self
1385− pid <- spawnLocal $ do
1564+ say $ (show self) ++ " registered as " ++ regName
1386− expect
1565+ expect :: Process ()
1387− register "test" pid
1566+ say $ (show self) ++ " exiting normally"
1388− tpid <- whereis "test"
1389− if tpid == Just pid
1390− then do _ <- monitor pid
1392− ProcessMonitorNotification{} <- expect
1393− tpid1 <- whereis "test"
1394− liftIO $ putMVar box (Nothing == tpid1)
1395− else liftIO $ putMVar box False
1397− takeMVar box >>= assertBool "expected local process to not be registered"
1400− -- Remote process. Test if remote process entry is removed
1401− -- from registry when process dies.
1402− remote1 <- testRemote remoteNode
1403− runProcess localNode $
1405− w <- whereis "test" :: Process (Maybe ProcessId)
1406− forM_ w (const waitpoll)
1407− in do register "test" remote1
1408− -- [race-condition] invalid test if we force exit before waitpoll runs
1409− registered <- whereis "test"
1410− registered `shouldBe` (equalTo (Just remote1))
1416− -- Many labels. Test if all labels associated with process
1417− -- are removed from registry when it dies.
1418− remote2 <- testRemote remoteNode
1419− runProcess localNode $
1421− w1 <- whereis "test-3" :: Process (Maybe ProcessId)
1422− w2 <- whereis "test-4" :: Process (Maybe ProcessId)
1423− forM_ (w1 <|> w2) (const waitpoll)
1424− in do register "test-3" remote2
1425− register "test-4" remote2
1430−{- XXX: waiting including patch for nsend for remote process
1431− remote3 <- testRemote remoteNode
1432− remote4 <- testRemote remoteNode
1433− -- test many labels
1434− runProcess localNode $ do
1435− register "test-3" remote3
1436− reregister "test-3" remote4
1438− liftIO $ threadDelay 50000 -- XXX: racy
1441− ProcessMonitorNotification{} <- expect
1445− -- Test registerRemoteAsync properties. Add a local process to
1446− -- remote registry and checks that it is removed
1447− -- when the process dies.
1448− remote5 <- testRemote remoteNode
1449− runProcess localNode $ do
1450− registerRemoteAsync (localNodeId remoteNode) "test" remote5
1452− match (\(RegisterReply _ True _) -> return ())
1455− whereisRemoteAsync (localNodeId remoteNode) "test"
1457− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1461− -- Add remote process to remote registry and checks if
1568+ runProcess node2 $ do
1462− -- entry is removed then process is dead.
1569+ register regName pid
1463− remote6 <- testRemote localNode
1570+ say $ regName ++ " registered to " ++ show pid
1464− runProcess localNode $ do
1571+ res <- whereis regName
1465− registerRemoteAsync (localNodeId remoteNode) "test" remote6
1572+ send pid ()
1466− receiveWait [
1573+ say $ " sent finish signal to " ++ show pid
1467− match (\(RegisterReply _ True _) -> return ())
1574+ us <- getSelfPid
1468− ] >>= send remote6
1575+ liftIO $ assertBool "expected (Just pid)" $ res == (Just pid)
1469− let waitpoll = do
1576+
1470− whereisRemoteAsync (localNodeId remoteNode) "test"
1577+
1471− receiveWait [
1578+ -- This delay isn't essential!
1472− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1579+ -- The test case passes perfectly fine without it (feel free to comment out
1473− ]
1580+ -- and see), however waiting a few seconds here, makes it much more likely
1474− waitpoll
1581+ -- that in delayUntilMaybeUnregistered we will hit the match case right
1475− where
1582+ -- away, and thus not be subjected to a 20 second delay. The value of 4
1476− testRemote node = do
1583+ -- seconds appears to work optimally on osx and across several linux distros
1477− -- test many labels
1584+ -- running in virtual machines (which is essentially what we do in CI)
1478− pidBox <- newEmptyMVar
1585+ void $ receiveTimeout 4000000 [ matchAny return ]
1479− forkProcess node $ do
1586+
1480− us <- getSelfPid
1587+ -- This delay doesn't serve much purpose in the happy path, however if some
1481− liftIO $ putMVar pidBox us
1588+ -- future patch breaks the cooperative behaviour of node controllers viz
1482− 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
1483− 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"
1485testUnsafeSend :: TestTransport -> Assertion
1625testUnsafeSend :: TestTransport -> Assertion
1486testUnsafeSend TestTransport{..} = do
1626testUnsafeSend TestTransport{..} = do
@@ -1497,8 +1637,7 @@ testUnsafeSend TestTransport{..} = do
1497 void $ forkProcess localNode $ do
1637 void $ forkProcess localNode $ do
1498 serverPid <- liftIO $ takeMVar serverAddr
1638 serverPid <- liftIO $ takeMVar serverAddr
1499 getSelfPid >>= unsafeSend serverPid
1639 getSelfPid >>= unsafeSend serverPid
1501− liftIO $ putMVar clientDone ()
1640+ expect >>= liftIO . putMVar clientDone
1503 takeMVar clientDone
1642 takeMVar clientDone
@@ -1517,8 +1656,7 @@ testUnsafeUSend TestTransport{..} = do
1517 void $ forkProcess localNode $ do
1656 void $ forkProcess localNode $ do
1518 serverPid <- liftIO $ takeMVar serverAddr
1657 serverPid <- liftIO $ takeMVar serverAddr
1519 getSelfPid >>= unsafeUSend serverPid
1658 getSelfPid >>= unsafeUSend serverPid
1521− liftIO $ putMVar clientDone ()
1659+ expect >>= liftIO . putMVar clientDone
1523 takeMVar clientDone
1661 takeMVar clientDone
@@ -1529,8 +1667,7 @@ testUnsafeNSend TestTransport{..} = do
1529 localNode <- newLocalNode testTransport initRemoteTable
1667 localNode <- newLocalNode testTransport initRemoteTable
1531 pid <- forkProcess localNode $ do
1669 pid <- forkProcess localNode $ do
1533− liftIO $ putMVar clientDone ()
1670+ expect >>= liftIO . putMVar clientDone
1535 void $ runProcess localNode $ do
1672 void $ runProcess localNode $ do
1536 register "foobar" pid
1673 register "foobar" pid
@@ -1548,8 +1685,7 @@ testUnsafeNSendRemote TestTransport{..} = do
1548 _ <- forkProcess localNode1 $ do
1685 _ <- forkProcess localNode1 $ do
1549 getSelfPid >>= register "foobar"
1686 getSelfPid >>= register "foobar"
1550 liftIO $ putMVar clientDone ()
1687 liftIO $ putMVar clientDone ()
1552− liftIO $ putMVar clientDone ()
1688+ expect >>= liftIO . putMVar clientDone
1554 takeMVar clientDone
1690 takeMVar clientDone
1555 void $ runProcess localNode2 $ do
1691 void $ runProcess localNode2 $ do
@@ -1573,7 +1709,7 @@ testUnsafeSendChan TestTransport{..} = do
1573 serverPid <- liftIO $ takeMVar serverAddr
1709 serverPid <- liftIO $ takeMVar serverAddr
1574 (sp, rp) <- newChan
1710 (sp, rp) <- newChan
1575 unsafeSend serverPid sp
1711 unsafeSend serverPid sp
1576− () <- receiveChan rp
1712+ receiveChan rp :: Process ()
1577 liftIO $ putMVar clientDone ()
1713 liftIO $ putMVar clientDone ()
1579 takeMVar clientDone
1715 takeMVar clientDone
@@ -1587,8 +1723,8 @@ testCallLocal TestTransport{..} = do
1587 runProcess node $ do
1723 runProcess node $ do
1588 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1589 liftIO $ putMVar result r
1725 liftIO $ putMVar result r
1590− True <- takeMVar result
1727+ takeMVar result >>= assertBool "Expected 'True'"
1593 -- Testing that when callLocal is interrupted, the worker is interrupted.
1729 -- Testing that when callLocal is interrupted, the worker is interrupted.
1594 ibox <- newIORef False
1730 ibox <- newIORef False
@@ -1605,10 +1741,9 @@ testCallLocal TestTransport{..} = do
1605 (send keeper ())
1741 (send keeper ())
1606 caller <- expect
1742 caller <- expect
1607 exit caller "test"
1743 exit caller "test"
1608− () <- expect
1744+ expect :: Process ()
1610− True <- readIORef ibox
1746+ readIORef ibox >>= assertBool "Expected 'True'"
1613 -- 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.
1614 ibox2 <- newIORef False
1749 ibox2 <- newIORef False
@@ -1617,8 +1752,8 @@ testCallLocal TestTransport{..} = do
1617 liftIO $ writeIORef ibox2 $ case r of
1752 liftIO $ writeIORef ibox2 $ case r of
1618 Left (ErrorCall "e") -> True
1753 Left (ErrorCall "e") -> True
1619 _ -> False
1754 _ -> False
1620− True <- readIORef ibox
1756+ readIORef ibox >>= assertBool "Expected 'True'"
1623 -- Test that caller waits for the worker in correct situation
1758 -- Test that caller waits for the worker in correct situation
1624 ibox3 <- newIORef False
1759 ibox3 <- newIORef False
@@ -1635,8 +1770,8 @@ testCallLocal TestTransport{..} = do
1635 liftIO $ putMVar result3 =<< readIORef ibox3
1770 liftIO $ putMVar result3 =<< readIORef ibox3
1636 worker <- expect
1771 worker <- expect
1637 send worker ()
1772 send worker ()
1638− True <- takeMVar result3
1774+ takeMVar result3 >>= assertBool "Expected 'True'"
1641 -- 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
1642 ibox4 <- newIORef False
1777 ibox4 <- newIORef False
@@ -1652,13 +1787,9 @@ testCallLocal TestTransport{..} = do
1652 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1653 caller <- expect
1788 caller <- expect
1654 exit caller "hi!"
1789 exit caller "hi!"
1655− True <- takeMVar result4
1657− -- 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.
1663tests :: TestTransport -> IO [Test]
1794tests :: TestTransport -> IO [Test]
1664tests testtrans = return [
1795tests testtrans = return [
@@ -1683,6 +1814,7 @@ tests testtrans = return [
1683 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
1814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
1684 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
1815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
1685 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
1686 , testCase "KillLocal" (testKillLocal testtrans)
1818 , testCase "KillLocal" (testKillLocal testtrans)
1687 , testCase "KillRemote" (testKillRemote testtrans)
1819 , testCase "KillRemote" (testKillRemote testtrans)
1688 , testCase "Die" (testDie testtrans)
1820 , testCase "Die" (testDie testtrans)
@@ -1692,7 +1824,7 @@ tests testtrans = return [
1692 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
1824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
1693 , testCase "ExitLocal" (testExitLocal testtrans)
1825 , testCase "ExitLocal" (testExitLocal testtrans)
1694 , testCase "ExitRemote" (testExitRemote testtrans)
1826 , testCase "ExitRemote" (testExitRemote testtrans)
1695− , testCase "TestRegistryMonitor" (testRegistryMonitoring testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
1696 , testCase "TextCallLocal" (testCallLocal testtrans)
1828 , testCase "TextCallLocal" (testCallLocal testtrans)
1697 -- Unsafe Primitives
1829 -- Unsafe Primitives
1698 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
1830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1745,17 +1877,3 @@ tests testtrans = return [
1745 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1749−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1750−syncBreakConnection breakConnection nid0 nid1 = do
1752− _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1753− runProcess nid0 $ do
1754− them <- liftIO $ takeMVar m
1755− pinger <- spawnLocal $ forever $ send them ()
1756− _ <- monitorNode (localNodeId nid1)
1757− liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1758− (nodeAddress $ localNodeId nid1)
1759− NodeMonitorNotification _ _ _ <- expect
1760− kill pinger "finished"