@@ -25,13 +25,18 @@ import Control.Concurrent.MVar
2525 )
2626import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
2727import Control.Exception (SomeException, throwIO, ErrorCall(..))
28−import qualified Control.Exception as Ex (catch)
29−import Control.Applicative ((<$>), (<*>), pure, (<|>))
28+import Control.Monad.Catch (try, catch, finally, mask, onException)
29+import Control.Applicative ((<|>))
3030import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
31−import Control.Distributed.Process
31+import Control.Distributed.Process hiding
32+ ( try
33+ , catch
34+ , finally
35+ , mask
36+ , onException
37+ )
3238import Control.Distributed.Process.Internal.Types
33− ( NodeId(nodeAddress)
34− , LocalNode(localEndPoint)
39+ ( LocalNode(localEndPoint)
3540 , ProcessExitException(..)
3641 , nullProcessId
3742 , createUnencodedMessage
@@ -39,12 +44,13 @@ import Control.Distributed.Process.Internal.Types
3944import Control.Distributed.Process.Node
4045import Control.Distributed.Process.Debug
4146import Control.Distributed.Process.Management.Internal.Types
47+import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
4248import Control.Distributed.Process.Serializable (Serializable)
43−
44−import Test.HUnit (Assertion, assertFailure, assertBool)
49+import Data.Maybe (isNothing, isJust)
50+import Test.HUnit (Assertion, assertBool, assertFailure)
4551import Test.Framework (Test, testGroup)
4652import Test.Framework.Providers.HUnit (testCase)
47−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
4854import Control.Rematch.Run (Match(..))
4955
5056newtype Ping = Ping ProcessId
@@ -67,7 +73,7 @@ expectThat a matcher = case res of
6773forkTry :: IO () -> IO ThreadId
6874forkTry p = do
6975 tid <- myThreadId
70− forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
76+ forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
7177
7278-- | The ping server from the paper
7379ping :: Process ()
@@ -77,12 +83,46 @@ ping = do
7783 send partner (Ping self)
7884 ping
7985
86+verifyClient :: String -> MVar Bool -> IO ()
87+verifyClient s b = takeMVar b >>= assertBool s
88+
89+expectPing :: MVar Bool -> Process ()
90+expectPing mv = expect >>= liftIO . putMVar mv . checkPing
91+ where
92+ checkPing (Ping _) = True
93+
8094-- | Quick and dirty synchronous version of whereisRemoteAsync
8195whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
8296whereisRemote nid string = do
8397 whereisRemoteAsync nid string
84− WhereIsReply _ mPid <- expect
85− return mPid
98+ receiveWait [
99+ match (\(WhereIsReply _ mPid) -> return mPid)
100+ ]
101+
102+verifyWhereIsRemote :: NodeId -> String -> Process ProcessId
103+verifyWhereIsRemote n s = whereisRemote n s >>= maybe (die "remote name not found") return
104+
105+waitForExit :: ProcessId -> Process DiedReason
106+waitForExit pid = monitor pid >>= waitForDown
107+
108+waitForDown :: MonitorRef -> Process DiedReason
109+waitForDown ref =
110+ receiveWait [ matchIf (\(ProcessMonitorNotification ref' _ _) -> ref == ref')
111+ (\(ProcessMonitorNotification _ _ dr) -> return dr) ]
112+
113+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
114+syncBreakConnection breakConnection nid0 nid1 = do
115+ m <- newEmptyMVar
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"
125+ return ()
86126
87127data Add = Add ProcessId Double Double deriving (Typeable)
88128data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -157,12 +197,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
157197 unmonitor ref
158198 liftIO $ putMVar done ()
159199 (False, ref) -> do
160− ProcessMonitorNotification ref' pid reason' <- expect
161− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
162− liftIO $ putMVar done ()
200+ receiveWait [
201+ match (\(ProcessMonitorNotification ref' pid reason') -> do
202+ liftIO $ do
203+ assertBool "Bad Monitor Signal"
204+ (Just ref' == ref && pid == theirAddr &&
205+ mOrL && reason == reason')
206+ putMVar done ())
207+ ]
163208 )
164209 (\(ProcessLinkException pid reason') -> do
165− True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
210+ (liftIO $ assertBool "link exception unmatched" $
211+ pid == theirAddr && not mOrL && not un && reason == reason')
166212 liftIO $ putMVar done ()
167213 )
168214
@@ -193,8 +239,10 @@ testPing TestTransport{..} = do
193239 pid <- getSelfPid
194240 replicateM_ numPings $ do
195241 send pingServer (Pong pid)
196− Ping _ <- expect
197− return ()
242+ p <- expectTimeout 3000000
243+ case p of
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
198246
199247 putMVar clientDone ()
200248
@@ -281,7 +329,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
281329 runProcess localNode $ do
282330 monitor theirAddr
283331 -- wait for the process to die
284− ProcessMonitorNotification _ _ _ <- expect
332+ expect :: Process ProcessMonitorNotification
285333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
286334
287335 takeMVar done
@@ -355,14 +403,17 @@ testMath TestTransport{..} = do
355403 runProcess localNode $ do
356404 pid <- getSelfPid
357405 send mathServer (Add pid 1 2)
358− 3 <- expect :: Process Double
406+ three <- expect :: Process Double
359407 send mathServer (Divide pid 8 2)
360− 4 <- expect :: Process Double
408+ four <- expect :: Process Double
361409 send mathServer (Divide pid 8 0)
362− DivByZero <- expect
363− liftIO $ putMVar clientDone ()
410+ divByZ <- expect
411+ liftIO $ putMVar clientDone (three, four, divByZ)
364412
365− takeMVar clientDone
413+ res <- takeMVar clientDone
414+ case res of
415+ (3, 4, DivByZero) -> return ()
416+ _ -> error $ "Something went horribly wrong"
366417
367418-- | Send first message (i.e. connect) to an already terminated process
368419-- (without monitoring); then send another message to a second process on
@@ -390,11 +441,9 @@ testSendToTerminated TestTransport{..} = do
390441 pid <- getSelfPid
391442 send server1 "Hi"
392443 send server2 (Pong pid)
393− Ping pid' <- expect
394− True <- return $ pid' == server2
395− liftIO $ putMVar clientDone ()
444+ expectPing clientDone
396445
397− takeMVar clientDone
446+ verifyClient "Expected Ping from server" clientDone
398447
399448-- | Test (non-zero) timeout
400449testTimeout :: TestTransport -> Assertion
@@ -403,10 +452,10 @@ testTimeout TestTransport{..} = do
403452 done <- newEmptyMVar
404453
405454 runProcess localNode $ do
406− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
407− liftIO $ putMVar done ()
455+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456+ liftIO $ putMVar done $ res == Nothing
408457
409− takeMVar done
458+ verifyClient "Expected receiveTimeout to timeout..." done
410459
411460-- | Test zero timeout
412461testTimeout0 :: TestTransport -> Assertion
@@ -434,10 +483,9 @@ testTimeout0 TestTransport{..} = do
434483 -- is not interested in, and then a single message that it wants
435484 replicateM_ 10000 $ send server "Irrelevant message"
436485 send server (Pong pid)
437− Ping _ <- expect
438− liftIO $ putMVar clientDone ()
486+ expectPing clientDone
439487
440− takeMVar clientDone
488+ verifyClient "Expected Ping from server" clientDone
441489
442490-- | Test typed channels
443491testTypedChannels :: TestTransport -> Assertion
@@ -460,10 +508,10 @@ testTypedChannels TestTransport{..} = do
460508 runProcess localNode $ do
461509 (clientSendPort, rport) <- newChan
462510 sendChan serverSendPort (clientSendPort, 5)
463− False <- receiveChan rport
464− liftIO $ putMVar clientDone ()
511+ ch <- receiveChan rport
512+ liftIO $ putMVar clientDone $ ch == False
465513
466− takeMVar clientDone
514+ verifyClient "Expected channel to send 'False'" clientDone
467515
468516-- | Test merging receive ports
469517testMergeChannels :: TestTransport -> Assertion
@@ -486,9 +534,8 @@ testMergeChannels TestTransport{..} = do
486534 rs <- mapM charChannel "abc"
487535 m <- mergePorts biased rs
488536 xs <- replicateM 9 $ receiveChan m
489− True <- return $ xs == expected
490− liftIO $ putMVar done ()
491− takeMVar done
537+ liftIO $ putMVar done $ xs == expected
538+ verifyClient "Expected single layer merge to match expected ordering" done
492539
493540 -- Two layers of merging
494541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -499,9 +546,8 @@ testMergeChannels TestTransport{..} = do
499546 ms <- mapM (mergePorts biasedInner) rss
500547 m <- mergePorts biasedOuter ms
501548 xs <- replicateM (9 * 3) $ receiveChan m
502− True <- return $ xs == expected
503− liftIO $ putMVar done ()
504− takeMVar done
549+ liftIO $ putMVar done $ xs == expected
550+ verifyClient "Expected nested channels to match expeted ordering" done
505551
506552 -- Test that if no messages are (immediately) available, the scheduler makes no difference
507553 testBlocked :: LocalNode -> Bool -> IO ()
@@ -510,43 +556,45 @@ testMergeChannels TestTransport{..} = do
510556 done <- newEmptyMVar
511557
512558 forkProcess localNode $ do
513− [sa, sb, sc] <- liftIO $ mapM readMVar vs
514− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
515− [ -- a, b, c
516− (sa, 'a')
517− , (sb, 'b')
518− , (sc, 'c')
519− -- a, c, b
520− , (sa, 'a')
521− , (sc, 'c')
522− , (sb, 'b')
523− -- b, a, c
524− , (sb, 'b')
525− , (sa, 'a')
526− , (sc, 'c')
527− -- b, c, a
528− , (sb, 'b')
529− , (sc, 'c')
530− , (sa, 'a')
531− -- c, a, b
532− , (sc, 'c')
533− , (sa, 'a')
534− , (sb, 'b')
535− -- c, b, a
536− , (sc, 'c')
537− , (sb, 'b')
538− , (sa, 'a')
539− ]
559+ ss <- liftIO $ mapM readMVar vs
560+ case ss of
561+ [sa, sb, sc] ->
562+ mapM_ ((>> pause 10000) . uncurry sendChan)
563+ [ -- a, b, c
564+ (sa, 'a')
565+ , (sb, 'b')
566+ , (sc, 'c')
567+ -- a, c, b
568+ , (sa, 'a')
569+ , (sc, 'c')
570+ , (sb, 'b')
571+ -- b, a, c
572+ , (sb, 'b')
573+ , (sa, 'a')
574+ , (sc, 'c')
575+ -- b, c, a
576+ , (sb, 'b')
577+ , (sc, 'c')
578+ , (sa, 'a')
579+ -- c, a, b
580+ , (sc, 'c')
581+ , (sa, 'a')
582+ , (sb, 'b')
583+ -- c, b, a
584+ , (sc, 'c')
585+ , (sb, 'b')
586+ , (sa, 'a')
587+ ]
588+ _ -> die "Something went horribly wrong"
540589
541590 forkProcess localNode $ do
542591 (ss, rs) <- unzip <$> replicateM 3 newChan
543592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
544593 m <- mergePorts biased rs
545594 xs <- replicateM (6 * 3) $ receiveChan m
546− True <- return $ xs == "abcacbbacbcacabcba"
547− liftIO $ putMVar done ()
595+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
548596
549− takeMVar done
597+ verifyClient "Expected merged ports to match expected ordering" done
550598
551599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
552600 mergePorts True = mergePortsBiased
@@ -564,8 +612,9 @@ testTerminate TestTransport{..} = do
564612 localNode <- newLocalNode testTransport initRemoteTable
565613 runProcess localNode $ do
566614 e <- try terminate :: Process (Either ProcessTerminationException ())
567− True <- return $ either show show e == show ProcessTerminationException
568− return ()
615+ if either show show e == show ProcessTerminationException
616+ then return ()
617+ else die "Unexpected result from terminate"
569618
570619testMonitorNode :: TestTransport -> Assertion
571620testMonitorNode TestTransport{..} = do
@@ -576,11 +625,12 @@ testMonitorNode TestTransport{..} = do
576625
577626 runProcess node2 $ do
578627 ref <- monitorNode (localNodeId node1)
579− NodeMonitorNotification ref' nid DiedDisconnect <- expect
580− True <- return $ ref == ref' && nid == localNodeId node1
581− liftIO $ putMVar done ()
628+ receiveWait [
629+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630+ return $ ref == ref' && nid == localNodeId node1)
631+ ] >>= liftIO . putMVar done
582632
583− takeMVar done
633+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
584634
585635testMonitorLiveNode :: TestTransport -> Assertion
586636testMonitorLiveNode TestTransport{..} = do
@@ -595,15 +645,16 @@ testMonitorLiveNode TestTransport{..} = do
595645 liftIO $ putMVar ready ()
596646 liftIO $ takeMVar readyr
597647 send p ()
598− NodeMonitorNotification ref' nid _ <- expect
599− True <- return $ ref == ref' && nid == localNodeId node1
600− liftIO $ putMVar done ()
648+ receiveWait [
649+ match (\(NodeMonitorNotification ref' nid _) ->
650+ (return $ ref == ref' && nid == localNodeId node1))
651+ ] >>= liftIO . putMVar done
601652
602653 takeMVar ready
603654 closeLocalNode node1
604655 putMVar readyr ()
605656
606− takeMVar done
657+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
607658
608659testMonitorChannel :: TestTransport -> Assertion
609660testMonitorChannel TestTransport{..} = do
@@ -613,18 +664,20 @@ testMonitorChannel TestTransport{..} = do
613664 pid <- forkProcess node1 $ do
614665 sport <- expect :: Process (SendPort ())
615666 ref <- monitorPort sport
616− PortMonitorNotification ref' port' reason <- expect
617− -- reason might be DiedUnknownId if the receive port is GCed before the
618− -- monitor is established (TODO: not sure that this is reasonable)
619− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
620− liftIO $ putMVar gotNotification ()
667+ receiveWait [
668+ -- reason might be DiedUnknownId if the receive port is GCed before the
669+ -- monitor is established (TODO: not sure that this is reasonable)
670+ match (\(PortMonitorNotification ref' port' reason) ->
671+ return $ ref' == ref && port' == sendPortId sport &&
672+ (reason == DiedNormal || reason == DiedUnknownId))
673+ ] >>= liftIO . putMVar gotNotification
621674
622675 runProcess node2 $ do
623676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
624677 send pid sport
625678 liftIO $ threadDelay 100000
626679
627− takeMVar gotNotification
680+ verifyClient "Expected PortMonitorNotification" gotNotification
628681
629682testRegistry :: TestTransport -> Assertion
630683testRegistry TestTransport{..} = do
@@ -636,20 +689,28 @@ testRegistry TestTransport{..} = do
636689
637690 runProcess node $ do
638691 register "ping" pingServer
639− Just pid <- whereis "ping"
640− True <- return $ pingServer == pid
692+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
641693 us <- getSelfPid
642694 nsend "ping" (Pong us)
643− Ping pid' <- expect
644− True <- return $ pingServer == pid'
645− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
646− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
647− True <- return $ x == pingServer
648− Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
695+ receiveWait [
696+ matchIf (\(Ping pid') -> pingServer == pid') (const $ return ())
697+ ]
698+ checkRegException "dead" Nothing deadProcess
699+ checkRegException "ping" (Just pingServer) deadProcess
700+ try (unregister "dead") >>= checkReg "dead" Nothing
649701 liftIO $ putMVar done ()
650702
651703 takeMVar done
652704
705+ where
706+ checkRegException name pid dead =
707+ try (register name dead) >>= checkReg name pid
708+
709+ checkReg name pid res =
710+ case res of
711+ Left (ProcessRegistrationException name pid) -> return ()
712+ _ -> die $ "Unexpected Registration" ++ show res
713+
653714testRegistryRemoteProcess :: TestTransport -> Assertion
654715testRegistryRemoteProcess TestTransport{..} = do
655716 node1 <- newLocalNode testTransport initRemoteTable
@@ -660,13 +721,13 @@ testRegistryRemoteProcess TestTransport{..} = do
660721
661722 runProcess node2 $ do
662723 register "ping" pingServer
663− Just pid <- whereis "ping"
664− True <- return $ pingServer == pid
724+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
665725 us <- getSelfPid
666726 nsend "ping" (Pong us)
667− Ping pid' <- expect
668− True <- return $ pingServer == pid'
669− liftIO $ putMVar done ()
727+ receiveWait [
728+ matchIf (\(Ping pid') -> pingServer == pid')
729+ (const $ liftIO $ putMVar done ())
730+ ]
670731
671732 takeMVar done
672733
@@ -674,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
674735testRemoteRegistry TestTransport{..} = do
675736 node1 <- newLocalNode testTransport initRemoteTable
676737 node2 <- newLocalNode testTransport initRemoteTable
677− done <- newEmptyMVar
678738
679739 pingServer <- forkProcess node1 ping
680740 deadProcess <- forkProcess node1 (return ())
@@ -687,32 +747,34 @@ testRemoteRegistry TestTransport{..} = do
687747 "ping" == label' && pid == pingServer)
688748 (\(RegisterReply _ _ _) -> return ()) ]
689749
690− Just pid <- whereisRemote nid1 "ping"
691− True <- return $ pingServer == pid
750+ pid <- verifyWhereIsRemote nid1 "ping"
751+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752+
692753 us <- getSelfPid
693754 nsendRemote nid1 "ping" (Pong us)
694− Ping pid' <- expect
695− True <- return $ pingServer == pid'
755+ receiveWait [
756+ match (\(Ping pid') -> return $ pingServer == pid')
757+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
696758
697759 -- test that if process was not registered Nothing is returned
698760 -- in owner field.
699761 registerRemoteAsync nid1 "dead" deadProcess
700− receiveWait [
701− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
702− (\(RegisterReply _ _ _) -> return ()) ]
762+ receiveWait [ matchIf (\(RegisterReply label' f mPid) -> "dead" == label')
763+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
764+ ] >>= liftIO . assertBool "Expected False Nothing in RegisterReply"
765+
703766 registerRemoteAsync nid1 "ping" deadProcess
704767 receiveWait [
705− matchIf (\(RegisterReply label' False (Just pid)) ->
706− "ping" == label' && pid == pingServer)
707− (\(RegisterReply _ _ _) -> return ()) ]
768+ matchIf (\(RegisterReply label' False mPid) ->
769+ "ping" == label' && isJust mPid)
770+ (\(RegisterReply _ f (Just pid'')) -> return (not f && pid'' == pingServer))
771+ ] >>= liftIO . assertBool "Expected False and (Just alreadyRegisteredPid) in RegisterReply"
772+
708773 unregisterRemoteAsync nid1 "dead"
709774 receiveWait [
710− matchIf (\(RegisterReply label' False Nothing) ->
711− "dead" == label' && pid == pingServer)
712− (\(RegisterReply _ _ _) -> return ()) ]
713− liftIO $ putMVar done ()
714−
715− takeMVar done
775+ matchIf (\(RegisterReply label' _ _) -> "dead" == label')
776+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
777+ ] >>= liftIO . assertBool "Expected False and Nothing in RegisterReply"
716778
717779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
718780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -728,15 +790,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
728790 receiveWait [
729791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
730792 (\(RegisterReply _ _ _) -> return ()) ]
731− Just pid <- whereisRemote nid1 "ping"
732− True <- return $ pingServer == pid
793+ pid <- verifyWhereIsRemote nid1 "ping"
794+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
733795 us <- getSelfPid
734796 nsendRemote nid1 "ping" (Pong us)
735− Ping pid' <- expect
736− True <- return $ pingServer == pid'
737− liftIO $ putMVar done ()
797+ receiveWait [
798+ match (\(Ping pid') -> return $ pingServer == pid')
799+ ] >>= liftIO . putMVar done
738800
739− takeMVar done
801+ verifyClient "Expected Ping with ping server's ProcessId" done
740802
741803testSpawnLocal :: TestTransport -> Assertion
742804testSpawnLocal TestTransport{..} = do
@@ -750,15 +812,14 @@ testSpawnLocal TestTransport{..} = do
750812 sport <- expect
751813 sendChan sport (1234 :: Int)
752814
753− sport <- spawnChannelLocal $ \rport -> do
754− (1234 :: Int) <- receiveChan rport
755− send us ()
815+ sport <- spawnChannelLocal $
816+ \rport -> (receiveChan rport :: Process Int) >>= send us
756817
757818 send pid sport
758− () <- expect
759− liftIO $ putMVar done ()
819+ expect >>= liftIO . putMVar done
760820
761− takeMVar done
821+ res <- takeMVar done
822+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
762823
763824testSpawnAsyncStrictness :: TestTransport -> Assertion
764825testSpawnAsyncStrictness TestTransport{..} = do
@@ -787,8 +848,9 @@ testReconnect TestTransport{..} = do
787848 liftIO $ putMVar processA us
788849 msg1 <- expect
789850 msg2 <- expect
790− True <- return $ msg1 == "message 1" && msg2 == "message 3"
791− liftIO $ putMVar sendTestOk ()
851+ liftIO $ do
852+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853+ putMVar sendTestOk ()
792854
793855 forkProcess node2 $ do
794856 {-
@@ -821,7 +883,7 @@ testReconnect TestTransport{..} = do
821883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
822884 (\(RegisterReply _ _ _) -> return ()) ]
823885
824− Just _ <- whereisRemote nid1 "a"
886+ _ <- whereisRemote nid1 "a"
825887
826888
827889 -- Simulate network failure
@@ -840,9 +902,10 @@ testReconnect TestTransport{..} = do
840902 (\(RegisterReply _ _ _) -> return ()) ]
841903
842904 -- Check
843− Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
844− Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
845− Just _ <- whereisRemote nid1 "c"
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
907+ verifyWhereIsRemote nid1 "b" -- this will suceed because the value is set after thereconnect
908+ verifyWhereIsRemote nid1 "c"
846909
847910 liftIO $ putMVar registerTestOk ()
848911
@@ -883,19 +946,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
883946 isSorted _ = True
884947 -- The list can't be null since there are no failures after sending
885948 -- the last message.
886− True <- return $ isSorted msgs && not (null msgs)
887− liftIO $ putMVar usendTestOk ()
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
888950
889951 forkProcess node2 $ do
890952 them <- liftIO $ readMVar processA
891953 getSelfPid >>= send them
892− () <- expect
954+ expect :: Process ()
893955 forM_ [1..numMessages] $ \i -> do
894956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
895957 usendPrim them i
896958 liftIO (threadDelay 30000)
897959
898− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
899962
900963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
901964-- in between
@@ -921,14 +984,17 @@ testMatchAny TestTransport{..} = do
921984 runProcess localNode $ do
922985 pid <- getSelfPid
923986 send mathServer (Add pid 1 2)
924− 3 <- expect :: Process Double
987+ three <- expect :: Process Double
925988 send mathServer (Divide pid 8 2)
926− 4 <- expect :: Process Double
989+ four <- expect :: Process Double
927990 send mathServer (Divide pid 8 0)
928− DivByZero <- expect
929− liftIO $ putMVar clientDone ()
991+ divByZ <- expect
992+ liftIO $ putMVar clientDone (three, four, divByZ)
930993
931− takeMVar clientDone
994+ res <- takeMVar clientDone
995+ case res of
996+ (3, 4, DivByZero) -> return ()
997+ _ -> error "Unexpected result"
932998
933999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
9341000-- in between, however we block 'Divide' requests ....
@@ -955,12 +1021,13 @@ testMatchAnyHandle TestTransport{..} = do
9551021 runProcess localNode $ do
9561022 pid <- getSelfPid
9571023 send mathServer (Add pid 1 2)
958− 3 <- expect :: Process Double
1024+ three <- expect :: Process Double
9591025 send mathServer (Divide pid 8 2)
960− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
961− liftIO $ putMVar clientDone ()
1026+ res <- (expectTimeout 100000) :: Process (Maybe Double)
1027+ liftIO $ putMVar clientDone $ three == 3 && res == Nothing
1028+
1029+ verifyClient "Expected Nothing (i.e. timeout)" clientDone
9621030
963− takeMVar clientDone
9641031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
9651032 maybeForward s msg =
9661033 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -988,8 +1055,10 @@ testMatchAnyNoHandle TestTransport{..} = do
9881055 Just _ -> die "NONSENSE")
9891056 ]
9901057 -- we *must* have removed the message from our mailbox though!!!
991− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
992− liftIO $ putMVar serverDone ()
1058+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1059+ liftIO $ do
1060+ assertBool "Expected timeout!" $ res == Nothing
1061+ putMVar serverDone ()
9931062 putMVar addr server
9941063
9951064 -- Client
@@ -1032,14 +1101,21 @@ testMatchAnyIf TestTransport{..} = do
10321101 runProcess localNode $ do
10331102 pid <- getSelfPid
10341103 send server (pid, "foo")
1035− "foo" <- expect
1036− send server (pid, "baz")
1037− "baz" <- expect
1104+ foo <- expect
1105+ -- provoking what would be the wrong ordering is informative here...
1106+
10381107 send server (pid, "bar")
1039− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1040− liftIO $ putMVar clientDone ()
1108+ bar <- (expectTimeout 100000) :: Process (Maybe String) -- was Double o_O !?
1109+
1110+ send server (pid, "baz")
1111+ baz <- expect
1112+
1113+ liftIO $ putMVar clientDone (foo, bar, baz)
1114+
1115+ res <- takeMVar clientDone
1116+ let res' = res == ("foo", Nothing, "baz")
1117+ assertBool "Expected timeout due to type mismatch" res'
10411118
1042− takeMVar clientDone
10431119 where tryHandleMessage :: Message -> Process (Maybe ())
10441120 tryHandleMessage msg =
10451121 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1072,12 +1148,13 @@ testMatchMessageWithUnwrap TestTransport{..} = do
10721148 runProcess localNode $ do
10731149 pid <- getSelfPid
10741150 send server (pid, wrapMessage ("foo" :: String))
1075− "foo" <- expect
1151+ foo <- expect
10761152 send server (pid, wrapMessage ("baz" :: String))
1077− "baz" <- expect
1078− liftIO $ putMVar clientDone ()
1153+ baz <- expect
1154+ liftIO $ putMVar clientDone (foo, baz)
10791155
1080− takeMVar clientDone
1156+ res <- takeMVar clientDone
1157+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
10811158
10821159-- Test 'receiveChanTimeout'
10831160testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1095,18 +1172,19 @@ testReceiveChanTimeout TestTransport{..} = do
10951172
10961173 -- Wait for a message with a delay. No message arrives, we should get
10971174 -- Nothing after the delay.
1098− Nothing <- receiveChanTimeout 100000 rp
1175+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
10991176
11001177 -- Let the sender know that it can send a message.
11011178 liftIO $ putMVar mvSender ()
11021179
11031180 -- Wait for a message with a delay again. Now a message arrives after
11041181 -- 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
11061184
11071185 -- Wait for a message with zero timeout: non-blocking check. No message is
11081186 -- available, we get Nothing
1109− Nothing <- receiveChanTimeout 0 rp
1187+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
11101188
11111189 -- Let the sender know that it can send a message.
11121190 liftIO $ putMVar mvSender ()
@@ -1116,7 +1194,7 @@ testReceiveChanTimeout TestTransport{..} = do
11161194 liftIO $ threadDelay 100000
11171195 mb <- receiveChanTimeout 0 rp
11181196 case mb of
1119− Just b -> do False <- return b; return ()
1197+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
11201198 _ -> loop
11211199
11221200 liftIO $ putMVar done ()
@@ -1153,8 +1231,8 @@ testReceiveChanFeatures TestTransport{..} = do
11531231
11541232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
11551233
1156− True <- receiveChan rp1
1157− False <- receiveChan rp1
1234+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
11581236
11591237 -- Test Applicative instance
11601238
@@ -1163,7 +1241,7 @@ testReceiveChanFeatures TestTransport{..} = do
11631241
11641242 let rp2 = pure (+) <*> rpInt <*> rpInt
11651243
1166− 7 <- receiveChan rp2
1244+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
11671245
11681246 -- Test Alternative instance
11691247
@@ -1172,8 +1250,8 @@ testReceiveChanFeatures TestTransport{..} = do
11721250
11731251 let rp3 = (even <$> rpInt) <|> rpBool
11741252
1175− False <- receiveChan rp3
1176− True <- receiveChan rp3
1253+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
11771255
11781256 -- Test Monad instance
11791257
@@ -1187,17 +1265,86 @@ testReceiveChanFeatures TestTransport{..} = do
11871265 then rpInt
11881266 else return 7
11891267
1190− 5 <- receiveChan rp4
1191− 7 <- receiveChan rp4
1268+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
11921270
11931271 liftIO $ putMVar done ()
11941272
11951273 takeMVar done
11961274
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
1281+
1282+ pid <- spawnLocal $ do tCh <- newChan :: Process (SendPort (), ReceivePort ())
1283+ liftIO $ putMVar tchMV tCh
1284+ expect :: Process ()
1285+ let (sp, _) = tCh
1286+ sendChan sp ()
1287+ expect :: Process ()
1288+
1289+ mRefPid <- monitor pid
1290+
1291+ cPid <- spawnLocal $ do
1292+ (sp', rp) <- liftIO $ takeMVar tchMV
1293+ -- say "picked up our test channel"
1294+ send pid ()
1295+ -- say "told pid to continue"
1296+ res <- receiveChanTimeout delay rp
1297+ case res of
1298+ Nothing -> say "initial chan () missing!" >> (liftIO $ putMVar result False)
1299+ Just () -> do mr <- monitor pid
1300+ pause 10000
1301+ -- say "sending pid a second () will cause it to exit"
1302+ send pid ()
1303+
1304+ -- say "make sure we see a DOWN notification for pid having stopped"
1305+ receiveWait [ match (\(_ :: ProcessMonitorNotification) -> return ()) ]
1306+
1307+ -- now that pid has died, the send port should be useless...
1308+ liftIO $ putMVar tchMV (sp', rp)
1309+
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
1315+
1316+ mRefCPid <- monitor cPid
1317+
1318+ receiveWait
1319+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefPid)
1320+ (\_ -> return ())
1321+ ]
1322+
1323+ -- say "seen first pid die..."
1324+
1325+ (sendPort, _) <- liftIO $ takeMVar tchMV
1326+ sendChan sendPort ()
1327+ -- say "sent () after owning pid died"
1328+
1329+ -- let cPid know we've written to the channel...
1330+ send cPid ()
1331+
1332+ receiveWait
1333+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefCPid)
1334+ (\_ -> return ())
1335+ ]
1336+
1337+ -- say "seen both pids die now..."
1338+
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
1343+
1344+
11971345testKillLocal :: TestTransport -> Assertion
11981346testKillLocal TestTransport{..} = do
11991347 localNode <- newLocalNode testTransport initRemoteTable
1200− done <- newEmptyMVar
12011348
12021349 pid <- forkProcess localNode $ do
12031350 liftIO $ threadDelay 1000000
@@ -1206,17 +1353,18 @@ testKillLocal TestTransport{..} = do
12061353 ref <- monitor pid
12071354 us <- getSelfPid
12081355 kill pid "TestKill"
1209− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1210− True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1211− liftIO $ putMVar done ()
1212−
1213− takeMVar done
1356+ mn <- expect
1357+ case mn of
1358+ ProcessMonitorNotification ref' pid' (DiedException ex) ->
1359+ case ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill" of
1360+ True -> return ()
1361+ False -> die "Invalid ProcessMonitorNotification received"
1362+ _ -> die "Something went horribly wrong"
12141363
12151364testKillRemote :: TestTransport -> Assertion
12161365testKillRemote TestTransport{..} = do
12171366 node1 <- newLocalNode testTransport initRemoteTable
12181367 node2 <- newLocalNode testTransport initRemoteTable
1219− done <- newEmptyMVar
12201368
12211369 pid <- forkProcess node1 $ do
12221370 liftIO $ threadDelay 1000000
@@ -1225,11 +1373,17 @@ testKillRemote TestTransport{..} = do
12251373 ref <- monitor pid
12261374 us <- getSelfPid
12271375 kill pid "TestKill"
1228− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1229− True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1230− liftIO $ putMVar done ()
1231−
1232− takeMVar done
1376+ mn <- expect
1377+ case mn of
1378+ ProcessMonitorNotification ref' pid' (DiedException reason) ->
1379+ case (ref == ref', pid == pid', reason == "killed-by=" ++ show us ++ ",reason=TestKill") of
1380+ (True, True, True) -> return ()
1381+ (a, b, c) -> do
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"
12331387
12341388testCatchesExit :: TestTransport -> Assertion
12351389testCatchesExit TestTransport{..} = do
@@ -1255,7 +1409,10 @@ testHandleMessageIf TestTransport{..} = do
12551409 self <- getSelfPid
12561410 send self (5 :: Integer, 10 :: Integer)
12571411 msg <- receiveWait [ matchMessage return ]
1258− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1412+ handleMessageIf msg
1413+ (\() -> True)
1414+ (\() -> die "whoops") >>= maybe (return ())
1415+ (const $ die "Expected Mismatch")
12591416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
12601417 (\input -> liftIO $ putMVar done input)
12611418 return ()
@@ -1300,8 +1457,11 @@ testDie TestTransport{..} = do
13001457 (die ("foobar", 123 :: Int))
13011458 `catchExit` \_from reason -> do
13021459 -- TODO: should verify that 'from' has the right value
1303− True <- return $ reason == ("foobar", 123 :: Int)
1460+ let res = reason == ("foobar", 123 :: Int)
13041461 liftIO $ putMVar done ()
1462+ if res
1463+ then return ()
1464+ else die "Something went horribly wrong"
13051465
13061466 takeMVar done
13071467
@@ -1315,8 +1475,11 @@ testPrettyExit TestTransport{..} = do
13151475 `catch` \ex@(ProcessExitException from _) ->
13161476 let expected = "exit-from=" ++ (show from)
13171477 in do
1318− True <- return $ (show ex) == expected
1478+ let res = (show ex) == expected
13191479 liftIO $ putMVar done ()
1480+ if res
1481+ then return ()
1482+ else die "Something went horribly wrong"
13201483
13211484 takeMVar done
13221485
@@ -1332,17 +1495,26 @@ testExitLocal TestTransport{..} = do
13321495 pid <- forkProcess localNode $ do
13331496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
13341497 -- TODO: should verify that 'from' has the right value
1335− True <- return $ reason == "TestExit"
1498+ res <- return $ reason == "TestExit"
13361499 liftIO $ putMVar supervisedDone ()
1500+ if res
1501+ then return ()
1502+ else die "Something went horribly wrong"
13371503
13381504 runProcess localNode $ do
13391505 liftIO $ takeMVar handlerSetUp
13401506 ref <- monitor pid
13411507 exit pid "TestExit"
13421508 -- This time the client catches the exception, so it dies normally
1343− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1344− True <- return $ ref == ref' && pid == pid'
1345− liftIO $ putMVar supervisorDone ()
1509+ mn <- expect
1510+ case mn of
1511+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1512+ let res = ref == ref' && pid == pid'
1513+ liftIO $ putMVar supervisorDone ()
1514+ if res
1515+ then return ()
1516+ else die "Something went horribly wrong"
1517+ _ -> die "Something went horribly wrong"
13461518
13471519 takeMVar supervisedDone
13481520 takeMVar supervisorDone
@@ -1358,125 +1530,97 @@ testExitRemote TestTransport{..} = do
13581530 (receiveWait [] :: Process ()) -- block forever
13591531 `catchExit` \_from reason -> do
13601532 -- TODO: should verify that 'from' has the right value
1361− True <- return $ reason == "TestExit"
1533+ res <- return $ reason == "TestExit"
13621534 liftIO $ putMVar supervisedDone ()
1535+ if res
1536+ then return ()
1537+ else die "Something went horribly wrong"
13631538
13641539 runProcess node2 $ do
13651540 ref <- monitor pid
13661541 exit pid "TestExit"
1367− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1368− True <- return $ ref == ref' && pid == pid'
1369− liftIO $ putMVar supervisorDone ()
1542+ mn <- expect
1543+ case mn of
1544+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1545+ res' <- return $ ref == ref' && pid == pid'
1546+ liftIO $ putMVar supervisorDone ()
1547+ if res'
1548+ then return ()
1549+ else die "Something went horribly wrong"
1550+ _ -> die "Something went horribly wrong"
13701551
13711552 takeMVar supervisedDone
13721553 takeMVar supervisorDone
13731554
13741555testRegistryMonitoring :: TestTransport -> Assertion
13751556testRegistryMonitoring TestTransport{..} = do
1376− localNode <- newLocalNode testTransport initRemoteTable
1377− remoteNode <- newLocalNode testTransport initRemoteTable
1378− return ()
1557+ node1 <- newLocalNode testTransport initRemoteTable
1558+ node2 <- newLocalNode testTransport initRemoteTable
13791559
1380− -- Local process. Test if local process will be removed from
1381− -- registry when it dies.
1382− box <- newEmptyMVar
1383− runProcess localNode $ do
1384− pid <- spawnLocal $ do
1385− expect
1386− register "test" pid
1387− tpid <- whereis "test"
1388− if tpid == Just pid
1389− then do _ <- monitor pid
1390− send pid ()
1391− ProcessMonitorNotification{} <- expect
1392− tpid1 <- whereis "test"
1393− liftIO $ putMVar box (Nothing == tpid1)
1394− else liftIO $ putMVar box False
1395−
1396− takeMVar box >>= assertBool "expected local process to not be registered"
1397− return ()
1398−
1399− -- Remote process. Test if remote process entry is removed
1400− -- from registry when process dies.
1401− remote1 <- testRemote remoteNode
1402− runProcess localNode $
1403− let waitpoll = do
1404− w <- whereis "test" :: Process (Maybe ProcessId)
1405− forM_ w (const waitpoll)
1406− in do register "test" remote1
1407− send remote1 ()
1408− waitpoll
1409− return ()
1410− return ()
1411−
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 $
1416− let waitpoll = do
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
1422− send remote2 ()
1423− waitpoll
1424− return ()
1425−
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
1433− send remote3 ()
1434− liftIO $ threadDelay 50000 -- XXX: racy
1435− monitor remote4
1436− nsend "test-3" ()
1437− ProcessMonitorNotification{} <- expect
1438− return ()
1439−-}
1440−
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
1447− receiveWait [
1448− match (\(RegisterReply _ True _) -> return ())
1449− ] >>= send remote5
1450− let waitpoll = do
1451− whereisRemoteAsync (localNodeId remoteNode) "test"
1452− receiveWait [
1453− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1454− ]
1455− waitpoll
1560+ let nid = localNodeId node2
1561+ pid <- forkProcess node1 $ do
1562+ self <- getSelfPid
1563+ runUntilRegistered nid self
1564+ say $ (show self) ++ " registered as " ++ regName
1565+ expect :: Process ()
1566+ say $ (show self) ++ " exiting normally"
14561567
1457− -- Add remote process to remote registry and checks if
1458− -- entry is removed then process is dead.
1459− remote6 <- testRemote localNode
1460− runProcess localNode $ do
1461− registerRemoteAsync (localNodeId remoteNode) "test" remote6
1462− receiveWait [
1463− match (\(RegisterReply _ True _) -> return ())
1464− ] >>= send remote6
1465− let waitpoll = do
1466− whereisRemoteAsync (localNodeId remoteNode) "test"
1467− receiveWait [
1468− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1469− ]
1470− waitpoll
1471− where
1472− testRemote node = do
1473− -- test many labels
1474− pidBox <- newEmptyMVar
1475− forkProcess node $ do
1476− us <- getSelfPid
1477− liftIO $ putMVar pidBox us
1478− expect :: Process ()
1479− takeMVar pidBox
1568+ runProcess node2 $ do
1569+ register regName pid
1570+ say $ regName ++ " registered to " ++ show pid
1571+ res <- whereis regName
1572+ send pid ()
1573+ say $ " sent finish signal to " ++ show pid
1574+ us <- getSelfPid
1575+ liftIO $ assertBool "expected (Just pid)" $ res == (Just pid)
1576+
1577+
1578+ -- This delay isn't essential!
1579+ -- The test case passes perfectly fine without it (feel free to comment out
1580+ -- and see), however waiting a few seconds here, makes it much more likely
1581+ -- that in delayUntilMaybeUnregistered we will hit the match case right
1582+ -- away, and thus not be subjected to a 20 second delay. The value of 4
1583+ -- seconds appears to work optimally on osx and across several linux distros
1584+ -- running in virtual machines (which is essentially what we do in CI)
1585+ void $ receiveTimeout 4000000 [ matchAny return ]
1586+
1587+ -- This delay doesn't serve much purpose in the happy path, however if some
1588+ -- future patch breaks the cooperative behaviour of node controllers viz
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
1595+ -- in either case.
1596+ runProcess node2 $ delayUntilMaybeUnregistered nid pid
1597+
1598+ regHere <- newEmptyMVar
1599+ runProcess node2 $ whereis regName >>= liftIO . putMVar regHere
1600+ res <- takeMVar regHere
1601+ case res of
1602+ Nothing -> return ()
1603+ Just pid -> assertBool ("expected Nothing, but got " ++ show pid) False
1604+
1605+ where
1606+ runUntilRegistered nid us = do
1607+ whereisRemoteAsync nid regName
1608+ receiveWait [
1609+ matchIf (\(WhereIsReply n (Just p)) -> n == regName && p == us)
1610+ (const $ return ())
1611+ ]
1612+
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 ())
1618+ ]
1619+ case res of
1620+ Just () -> return ()
1621+ Nothing -> delayUntilMaybeUnregistered nid p
1622+
1623+ regName = "testRegisterRemote"
14801624
14811625testUnsafeSend :: TestTransport -> Assertion
14821626testUnsafeSend TestTransport{..} = do
@@ -1493,8 +1637,7 @@ testUnsafeSend TestTransport{..} = do
14931637 void $ forkProcess localNode $ do
14941638 serverPid <- liftIO $ takeMVar serverAddr
14951639 getSelfPid >>= unsafeSend serverPid
1496− () <- expect
1497− liftIO $ putMVar clientDone ()
1640+ expect >>= liftIO . putMVar clientDone
14981641
14991642 takeMVar clientDone
15001643
@@ -1513,8 +1656,7 @@ testUnsafeUSend TestTransport{..} = do
15131656 void $ forkProcess localNode $ do
15141657 serverPid <- liftIO $ takeMVar serverAddr
15151658 getSelfPid >>= unsafeUSend serverPid
1516− () <- expect
1517− liftIO $ putMVar clientDone ()
1659+ expect >>= liftIO . putMVar clientDone
15181660
15191661 takeMVar clientDone
15201662
@@ -1525,8 +1667,7 @@ testUnsafeNSend TestTransport{..} = do
15251667 localNode <- newLocalNode testTransport initRemoteTable
15261668
15271669 pid <- forkProcess localNode $ do
1528− () <- expect
1529− liftIO $ putMVar clientDone ()
1670+ expect >>= liftIO . putMVar clientDone
15301671
15311672 void $ runProcess localNode $ do
15321673 register "foobar" pid
@@ -1544,8 +1685,7 @@ testUnsafeNSendRemote TestTransport{..} = do
15441685 _ <- forkProcess localNode1 $ do
15451686 getSelfPid >>= register "foobar"
15461687 liftIO $ putMVar clientDone ()
1547− () <- expect
1548− liftIO $ putMVar clientDone ()
1688+ expect >>= liftIO . putMVar clientDone
15491689
15501690 takeMVar clientDone
15511691 void $ runProcess localNode2 $ do
@@ -1569,7 +1709,7 @@ testUnsafeSendChan TestTransport{..} = do
15691709 serverPid <- liftIO $ takeMVar serverAddr
15701710 (sp, rp) <- newChan
15711711 unsafeSend serverPid sp
1572− () <- receiveChan rp
1712+ receiveChan rp :: Process ()
15731713 liftIO $ putMVar clientDone ()
15741714
15751715 takeMVar clientDone
@@ -1583,8 +1723,8 @@ testCallLocal TestTransport{..} = do
15831723 runProcess node $ do
15841724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
15851725 liftIO $ putMVar result r
1586− True <- takeMVar result
1587− return ()
1726+
1727+ takeMVar result >>= assertBool "Expected 'True'"
15881728
15891729 -- Testing that when callLocal is interrupted, the worker is interrupted.
15901730 ibox <- newIORef False
@@ -1601,10 +1741,9 @@ testCallLocal TestTransport{..} = do
16011741 (send keeper ())
16021742 caller <- expect
16031743 exit caller "test"
1604− () <- expect
1605− return ()
1606− True <- readIORef ibox
1607− return ()
1744+ expect :: Process ()
1745+
1746+ readIORef ibox >>= assertBool "Expected 'True'"
16081747
16091748 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
16101749 ibox2 <- newIORef False
@@ -1613,8 +1752,8 @@ testCallLocal TestTransport{..} = do
16131752 liftIO $ writeIORef ibox2 $ case r of
16141753 Left (ErrorCall "e") -> True
16151754 _ -> False
1616− True <- readIORef ibox
1617− return ()
1755+
1756+ readIORef ibox >>= assertBool "Expected 'True'"
16181757
16191758 -- Test that caller waits for the worker in correct situation
16201759 ibox3 <- newIORef False
@@ -1631,8 +1770,8 @@ testCallLocal TestTransport{..} = do
16311770 liftIO $ putMVar result3 =<< readIORef ibox3
16321771 worker <- expect
16331772 send worker ()
1634− True <- takeMVar result3
1635− return ()
1773+
1774+ takeMVar result3 >>= assertBool "Expected 'True'"
16361775
16371776 -- Test that caller waits for the worker in case when caller gets an exception
16381777 ibox4 <- newIORef False
@@ -1648,13 +1787,9 @@ testCallLocal TestTransport{..} = do
16481787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
16491788 caller <- expect
16501789 exit caller "hi!"
1651− True <- takeMVar result4
1652− return ()
1653− -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1654−
1655−
1656−
16571790
1791+ takeMVar result4 >>= assertBool "Expected 'True'"
1792+ -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
16581793
16591794tests :: TestTransport -> IO [Test]
16601795tests testtrans = return [
@@ -1679,6 +1814,7 @@ tests testtrans = return [
16791814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
16801815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
16811816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
16821818 , testCase "KillLocal" (testKillLocal testtrans)
16831819 , testCase "KillRemote" (testKillRemote testtrans)
16841820 , testCase "Die" (testDie testtrans)
@@ -1688,7 +1824,7 @@ tests testtrans = return [
16881824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
16891825 , testCase "ExitLocal" (testExitLocal testtrans)
16901826 , testCase "ExitRemote" (testExitRemote testtrans)
1691− , testCase "TestRegistryMonitor" (testRegistryMonitoring testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
16921828 , testCase "TextCallLocal" (testCallLocal testtrans)
16931829 -- Unsafe Primitives
16941830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1741,17 +1877,3 @@ tests testtrans = return [
17411877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
17421878 ]
17431879 ]
1744−
1745−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1746−syncBreakConnection breakConnection nid0 nid1 = do
1747− m <- newEmptyMVar
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"
1757− return ()