@@ -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,13 +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
42−import Control.Distributed.Process.Tests.Internal.Utils (shouldBe)
47+import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
4348import Control.Distributed.Process.Serializable (Serializable)
44−
45−import Test.HUnit (Assertion, assertFailure, assertBool)
49+import Data.Maybe (isNothing, isJust)
50+import Test.HUnit (Assertion, assertBool, assertFailure)
4651import Test.Framework (Test, testGroup)
4752import Test.Framework.Providers.HUnit (testCase)
48−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
4954import Control.Rematch.Run (Match(..))
5055
5156newtype Ping = Ping ProcessId
@@ -68,7 +73,7 @@ expectThat a matcher = case res of
6873forkTry :: IO () -> IO ThreadId
6974forkTry p = do
7075 tid <- myThreadId
71− forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
76+ forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
7277
7378-- | The ping server from the paper
7479ping :: Process ()
@@ -78,12 +83,46 @@ ping = do
7883 send partner (Ping self)
7984 ping
8085
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+
8194-- | Quick and dirty synchronous version of whereisRemoteAsync
8295whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
8396whereisRemote nid string = do
8497 whereisRemoteAsync nid string
85− WhereIsReply _ mPid <- expect
86− 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 ()
87126
88127data Add = Add ProcessId Double Double deriving (Typeable)
89128data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -158,12 +197,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
158197 unmonitor ref
159198 liftIO $ putMVar done ()
160199 (False, ref) -> do
161− ProcessMonitorNotification ref' pid reason' <- expect
162− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
163− 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+ ]
164208 )
165209 (\(ProcessLinkException pid reason') -> do
166− 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')
167212 liftIO $ putMVar done ()
168213 )
169214
@@ -194,8 +239,10 @@ testPing TestTransport{..} = do
194239 pid <- getSelfPid
195240 replicateM_ numPings $ do
196241 send pingServer (Pong pid)
197− Ping _ <- expect
198− return ()
242+ p <- expectTimeout 3000000
243+ case p of
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
199246
200247 putMVar clientDone ()
201248
@@ -282,7 +329,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
282329 runProcess localNode $ do
283330 monitor theirAddr
284331 -- wait for the process to die
285− ProcessMonitorNotification _ _ _ <- expect
332+ expect :: Process ProcessMonitorNotification
286333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
287334
288335 takeMVar done
@@ -356,14 +403,17 @@ testMath TestTransport{..} = do
356403 runProcess localNode $ do
357404 pid <- getSelfPid
358405 send mathServer (Add pid 1 2)
359− 3 <- expect :: Process Double
406+ three <- expect :: Process Double
360407 send mathServer (Divide pid 8 2)
361− 4 <- expect :: Process Double
408+ four <- expect :: Process Double
362409 send mathServer (Divide pid 8 0)
363− DivByZero <- expect
364− liftIO $ putMVar clientDone ()
410+ divByZ <- expect
411+ liftIO $ putMVar clientDone (three, four, divByZ)
365412
366− takeMVar clientDone
413+ res <- takeMVar clientDone
414+ case res of
415+ (3, 4, DivByZero) -> return ()
416+ _ -> error $ "Something went horribly wrong"
367417
368418-- | Send first message (i.e. connect) to an already terminated process
369419-- (without monitoring); then send another message to a second process on
@@ -391,11 +441,9 @@ testSendToTerminated TestTransport{..} = do
391441 pid <- getSelfPid
392442 send server1 "Hi"
393443 send server2 (Pong pid)
394− Ping pid' <- expect
395− True <- return $ pid' == server2
396− liftIO $ putMVar clientDone ()
444+ expectPing clientDone
397445
398− takeMVar clientDone
446+ verifyClient "Expected Ping from server" clientDone
399447
400448-- | Test (non-zero) timeout
401449testTimeout :: TestTransport -> Assertion
@@ -404,10 +452,10 @@ testTimeout TestTransport{..} = do
404452 done <- newEmptyMVar
405453
406454 runProcess localNode $ do
407− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
408− liftIO $ putMVar done ()
455+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456+ liftIO $ putMVar done $ res == Nothing
409457
410− takeMVar done
458+ verifyClient "Expected receiveTimeout to timeout..." done
411459
412460-- | Test zero timeout
413461testTimeout0 :: TestTransport -> Assertion
@@ -435,10 +483,9 @@ testTimeout0 TestTransport{..} = do
435483 -- is not interested in, and then a single message that it wants
436484 replicateM_ 10000 $ send server "Irrelevant message"
437485 send server (Pong pid)
438− Ping _ <- expect
439− liftIO $ putMVar clientDone ()
486+ expectPing clientDone
440487
441− takeMVar clientDone
488+ verifyClient "Expected Ping from server" clientDone
442489
443490-- | Test typed channels
444491testTypedChannels :: TestTransport -> Assertion
@@ -461,10 +508,10 @@ testTypedChannels TestTransport{..} = do
461508 runProcess localNode $ do
462509 (clientSendPort, rport) <- newChan
463510 sendChan serverSendPort (clientSendPort, 5)
464− False <- receiveChan rport
465− liftIO $ putMVar clientDone ()
511+ ch <- receiveChan rport
512+ liftIO $ putMVar clientDone $ ch == False
466513
467− takeMVar clientDone
514+ verifyClient "Expected channel to send 'False'" clientDone
468515
469516-- | Test merging receive ports
470517testMergeChannels :: TestTransport -> Assertion
@@ -487,9 +534,8 @@ testMergeChannels TestTransport{..} = do
487534 rs <- mapM charChannel "abc"
488535 m <- mergePorts biased rs
489536 xs <- replicateM 9 $ receiveChan m
490− True <- return $ xs == expected
491− liftIO $ putMVar done ()
492− takeMVar done
537+ liftIO $ putMVar done $ xs == expected
538+ verifyClient "Expected single layer merge to match expected ordering" done
493539
494540 -- Two layers of merging
495541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -500,9 +546,8 @@ testMergeChannels TestTransport{..} = do
500546 ms <- mapM (mergePorts biasedInner) rss
501547 m <- mergePorts biasedOuter ms
502548 xs <- replicateM (9 * 3) $ receiveChan m
503− True <- return $ xs == expected
504− liftIO $ putMVar done ()
505− takeMVar done
549+ liftIO $ putMVar done $ xs == expected
550+ verifyClient "Expected nested channels to match expeted ordering" done
506551
507552 -- Test that if no messages are (immediately) available, the scheduler makes no difference
508553 testBlocked :: LocalNode -> Bool -> IO ()
@@ -511,43 +556,45 @@ testMergeChannels TestTransport{..} = do
511556 done <- newEmptyMVar
512557
513558 forkProcess localNode $ do
514− [sa, sb, sc] <- liftIO $ mapM readMVar vs
515− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
516− [ -- a, b, c
517− (sa, 'a')
518− , (sb, 'b')
519− , (sc, 'c')
520− -- a, c, b
521− , (sa, 'a')
522− , (sc, 'c')
523− , (sb, 'b')
524− -- b, a, c
525− , (sb, 'b')
526− , (sa, 'a')
527− , (sc, 'c')
528− -- b, c, a
529− , (sb, 'b')
530− , (sc, 'c')
531− , (sa, 'a')
532− -- c, a, b
533− , (sc, 'c')
534− , (sa, 'a')
535− , (sb, 'b')
536− -- c, b, a
537− , (sc, 'c')
538− , (sb, 'b')
539− , (sa, 'a')
540− ]
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"
541589
542590 forkProcess localNode $ do
543591 (ss, rs) <- unzip <$> replicateM 3 newChan
544592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
545593 m <- mergePorts biased rs
546594 xs <- replicateM (6 * 3) $ receiveChan m
547− True <- return $ xs == "abcacbbacbcacabcba"
548− liftIO $ putMVar done ()
595+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
549596
550− takeMVar done
597+ verifyClient "Expected merged ports to match expected ordering" done
551598
552599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
553600 mergePorts True = mergePortsBiased
@@ -565,8 +612,9 @@ testTerminate TestTransport{..} = do
565612 localNode <- newLocalNode testTransport initRemoteTable
566613 runProcess localNode $ do
567614 e <- try terminate :: Process (Either ProcessTerminationException ())
568− True <- return $ either show show e == show ProcessTerminationException
569− return ()
615+ if either show show e == show ProcessTerminationException
616+ then return ()
617+ else die "Unexpected result from terminate"
570618
571619testMonitorNode :: TestTransport -> Assertion
572620testMonitorNode TestTransport{..} = do
@@ -577,11 +625,12 @@ testMonitorNode TestTransport{..} = do
577625
578626 runProcess node2 $ do
579627 ref <- monitorNode (localNodeId node1)
580− NodeMonitorNotification ref' nid DiedDisconnect <- expect
581− True <- return $ ref == ref' && nid == localNodeId node1
582− liftIO $ putMVar done ()
628+ receiveWait [
629+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630+ return $ ref == ref' && nid == localNodeId node1)
631+ ] >>= liftIO . putMVar done
583632
584− takeMVar done
633+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
585634
586635testMonitorLiveNode :: TestTransport -> Assertion
587636testMonitorLiveNode TestTransport{..} = do
@@ -596,15 +645,16 @@ testMonitorLiveNode TestTransport{..} = do
596645 liftIO $ putMVar ready ()
597646 liftIO $ takeMVar readyr
598647 send p ()
599− NodeMonitorNotification ref' nid _ <- expect
600− True <- return $ ref == ref' && nid == localNodeId node1
601− liftIO $ putMVar done ()
648+ receiveWait [
649+ match (\(NodeMonitorNotification ref' nid _) ->
650+ (return $ ref == ref' && nid == localNodeId node1))
651+ ] >>= liftIO . putMVar done
602652
603653 takeMVar ready
604654 closeLocalNode node1
605655 putMVar readyr ()
606656
607− takeMVar done
657+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
608658
609659testMonitorChannel :: TestTransport -> Assertion
610660testMonitorChannel TestTransport{..} = do
@@ -614,18 +664,20 @@ testMonitorChannel TestTransport{..} = do
614664 pid <- forkProcess node1 $ do
615665 sport <- expect :: Process (SendPort ())
616666 ref <- monitorPort sport
617− PortMonitorNotification ref' port' reason <- expect
618− -- reason might be DiedUnknownId if the receive port is GCed before the
619− -- monitor is established (TODO: not sure that this is reasonable)
620− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
621− 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
622674
623675 runProcess node2 $ do
624676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
625677 send pid sport
626678 liftIO $ threadDelay 100000
627679
628− takeMVar gotNotification
680+ verifyClient "Expected PortMonitorNotification" gotNotification
629681
630682testRegistry :: TestTransport -> Assertion
631683testRegistry TestTransport{..} = do
@@ -637,20 +689,28 @@ testRegistry TestTransport{..} = do
637689
638690 runProcess node $ do
639691 register "ping" pingServer
640− Just pid <- whereis "ping"
641− True <- return $ pingServer == pid
692+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
642693 us <- getSelfPid
643694 nsend "ping" (Pong us)
644− Ping pid' <- expect
645− True <- return $ pingServer == pid'
646− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
647− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
648− True <- return $ x == pingServer
649− 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
650701 liftIO $ putMVar done ()
651702
652703 takeMVar done
653704
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+
654714testRegistryRemoteProcess :: TestTransport -> Assertion
655715testRegistryRemoteProcess TestTransport{..} = do
656716 node1 <- newLocalNode testTransport initRemoteTable
@@ -661,13 +721,13 @@ testRegistryRemoteProcess TestTransport{..} = do
661721
662722 runProcess node2 $ do
663723 register "ping" pingServer
664− Just pid <- whereis "ping"
665− True <- return $ pingServer == pid
724+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
666725 us <- getSelfPid
667726 nsend "ping" (Pong us)
668− Ping pid' <- expect
669− True <- return $ pingServer == pid'
670− liftIO $ putMVar done ()
727+ receiveWait [
728+ matchIf (\(Ping pid') -> pingServer == pid')
729+ (const $ liftIO $ putMVar done ())
730+ ]
671731
672732 takeMVar done
673733
@@ -675,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
675735testRemoteRegistry TestTransport{..} = do
676736 node1 <- newLocalNode testTransport initRemoteTable
677737 node2 <- newLocalNode testTransport initRemoteTable
678− done <- newEmptyMVar
679738
680739 pingServer <- forkProcess node1 ping
681740 deadProcess <- forkProcess node1 (return ())
@@ -688,32 +747,34 @@ testRemoteRegistry TestTransport{..} = do
688747 "ping" == label' && pid == pingServer)
689748 (\(RegisterReply _ _ _) -> return ()) ]
690749
691− Just pid <- whereisRemote nid1 "ping"
692− True <- return $ pingServer == pid
750+ pid <- verifyWhereIsRemote nid1 "ping"
751+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752+
693753 us <- getSelfPid
694754 nsendRemote nid1 "ping" (Pong us)
695− Ping pid' <- expect
696− True <- return $ pingServer == pid'
755+ receiveWait [
756+ match (\(Ping pid') -> return $ pingServer == pid')
757+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
697758
698759 -- test that if process was not registered Nothing is returned
699760 -- in owner field.
700761 registerRemoteAsync nid1 "dead" deadProcess
701− receiveWait [
702− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
703− (\(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+
704766 registerRemoteAsync nid1 "ping" deadProcess
705767 receiveWait [
706− matchIf (\(RegisterReply label' False (Just pid)) ->
707− "ping" == label' && pid == pingServer)
708− (\(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+
709773 unregisterRemoteAsync nid1 "dead"
710774 receiveWait [
711− matchIf (\(RegisterReply label' False Nothing) ->
712− "dead" == label' && pid == pingServer)
713− (\(RegisterReply _ _ _) -> return ()) ]
714− liftIO $ putMVar done ()
715−
716− 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"
717778
718779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
719780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -729,15 +790,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
729790 receiveWait [
730791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
731792 (\(RegisterReply _ _ _) -> return ()) ]
732− Just pid <- whereisRemote nid1 "ping"
733− True <- return $ pingServer == pid
793+ pid <- verifyWhereIsRemote nid1 "ping"
794+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
734795 us <- getSelfPid
735796 nsendRemote nid1 "ping" (Pong us)
736− Ping pid' <- expect
737− True <- return $ pingServer == pid'
738− liftIO $ putMVar done ()
797+ receiveWait [
798+ match (\(Ping pid') -> return $ pingServer == pid')
799+ ] >>= liftIO . putMVar done
739800
740− takeMVar done
801+ verifyClient "Expected Ping with ping server's ProcessId" done
741802
742803testSpawnLocal :: TestTransport -> Assertion
743804testSpawnLocal TestTransport{..} = do
@@ -751,15 +812,14 @@ testSpawnLocal TestTransport{..} = do
751812 sport <- expect
752813 sendChan sport (1234 :: Int)
753814
754− sport <- spawnChannelLocal $ \rport -> do
755− (1234 :: Int) <- receiveChan rport
756− send us ()
815+ sport <- spawnChannelLocal $
816+ \rport -> (receiveChan rport :: Process Int) >>= send us
757817
758818 send pid sport
759− () <- expect
760− liftIO $ putMVar done ()
819+ expect >>= liftIO . putMVar done
761820
762− takeMVar done
821+ res <- takeMVar done
822+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
763823
764824testSpawnAsyncStrictness :: TestTransport -> Assertion
765825testSpawnAsyncStrictness TestTransport{..} = do
@@ -788,8 +848,9 @@ testReconnect TestTransport{..} = do
788848 liftIO $ putMVar processA us
789849 msg1 <- expect
790850 msg2 <- expect
791− True <- return $ msg1 == "message 1" && msg2 == "message 3"
792− liftIO $ putMVar sendTestOk ()
851+ liftIO $ do
852+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853+ putMVar sendTestOk ()
793854
794855 forkProcess node2 $ do
795856 {-
@@ -822,7 +883,7 @@ testReconnect TestTransport{..} = do
822883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
823884 (\(RegisterReply _ _ _) -> return ()) ]
824885
825− Just _ <- whereisRemote nid1 "a"
886+ _ <- whereisRemote nid1 "a"
826887
827888
828889 -- Simulate network failure
@@ -841,9 +902,10 @@ testReconnect TestTransport{..} = do
841902 (\(RegisterReply _ _ _) -> return ()) ]
842903
843904 -- Check
844− Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
845− Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
846− 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"
847909
848910 liftIO $ putMVar registerTestOk ()
849911
@@ -884,19 +946,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
884946 isSorted _ = True
885947 -- The list can't be null since there are no failures after sending
886948 -- the last message.
887− True <- return $ isSorted msgs && not (null msgs)
888− liftIO $ putMVar usendTestOk ()
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
889950
890951 forkProcess node2 $ do
891952 them <- liftIO $ readMVar processA
892953 getSelfPid >>= send them
893− () <- expect
954+ expect :: Process ()
894955 forM_ [1..numMessages] $ \i -> do
895956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
896957 usendPrim them i
897958 liftIO (threadDelay 30000)
898959
899− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
900962
901963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
902964-- in between
@@ -922,14 +984,17 @@ testMatchAny TestTransport{..} = do
922984 runProcess localNode $ do
923985 pid <- getSelfPid
924986 send mathServer (Add pid 1 2)
925− 3 <- expect :: Process Double
987+ three <- expect :: Process Double
926988 send mathServer (Divide pid 8 2)
927− 4 <- expect :: Process Double
989+ four <- expect :: Process Double
928990 send mathServer (Divide pid 8 0)
929− DivByZero <- expect
930− liftIO $ putMVar clientDone ()
991+ divByZ <- expect
992+ liftIO $ putMVar clientDone (three, four, divByZ)
931993
932− takeMVar clientDone
994+ res <- takeMVar clientDone
995+ case res of
996+ (3, 4, DivByZero) -> return ()
997+ _ -> error "Unexpected result"
933998
934999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
9351000-- in between, however we block 'Divide' requests ....
@@ -956,12 +1021,13 @@ testMatchAnyHandle TestTransport{..} = do
9561021 runProcess localNode $ do
9571022 pid <- getSelfPid
9581023 send mathServer (Add pid 1 2)
959− 3 <- expect :: Process Double
1024+ three <- expect :: Process Double
9601025 send mathServer (Divide pid 8 2)
961− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
962− 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
9631030
964− takeMVar clientDone
9651031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
9661032 maybeForward s msg =
9671033 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -989,8 +1055,10 @@ testMatchAnyNoHandle TestTransport{..} = do
9891055 Just _ -> die "NONSENSE")
9901056 ]
9911057 -- we *must* have removed the message from our mailbox though!!!
992− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
993− liftIO $ putMVar serverDone ()
1058+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1059+ liftIO $ do
1060+ assertBool "Expected timeout!" $ res == Nothing
1061+ putMVar serverDone ()
9941062 putMVar addr server
9951063
9961064 -- Client
@@ -1033,14 +1101,21 @@ testMatchAnyIf TestTransport{..} = do
10331101 runProcess localNode $ do
10341102 pid <- getSelfPid
10351103 send server (pid, "foo")
1036− "foo" <- expect
1037− send server (pid, "baz")
1038− "baz" <- expect
1104+ foo <- expect
1105+ -- provoking what would be the wrong ordering is informative here...
1106+
10391107 send server (pid, "bar")
1040− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1041− 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'
10421118
1043− takeMVar clientDone
10441119 where tryHandleMessage :: Message -> Process (Maybe ())
10451120 tryHandleMessage msg =
10461121 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1073,12 +1148,13 @@ testMatchMessageWithUnwrap TestTransport{..} = do
10731148 runProcess localNode $ do
10741149 pid <- getSelfPid
10751150 send server (pid, wrapMessage ("foo" :: String))
1076− "foo" <- expect
1151+ foo <- expect
10771152 send server (pid, wrapMessage ("baz" :: String))
1078− "baz" <- expect
1079− liftIO $ putMVar clientDone ()
1153+ baz <- expect
1154+ liftIO $ putMVar clientDone (foo, baz)
10801155
1081− takeMVar clientDone
1156+ res <- takeMVar clientDone
1157+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
10821158
10831159-- Test 'receiveChanTimeout'
10841160testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1096,18 +1172,19 @@ testReceiveChanTimeout TestTransport{..} = do
10961172
10971173 -- Wait for a message with a delay. No message arrives, we should get
10981174 -- Nothing after the delay.
1099− Nothing <- receiveChanTimeout 100000 rp
1175+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
11001176
11011177 -- Let the sender know that it can send a message.
11021178 liftIO $ putMVar mvSender ()
11031179
11041180 -- Wait for a message with a delay again. Now a message arrives after
11051181 -- 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
11071184
11081185 -- Wait for a message with zero timeout: non-blocking check. No message is
11091186 -- available, we get Nothing
1110− Nothing <- receiveChanTimeout 0 rp
1187+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
11111188
11121189 -- Let the sender know that it can send a message.
11131190 liftIO $ putMVar mvSender ()
@@ -1117,7 +1194,7 @@ testReceiveChanTimeout TestTransport{..} = do
11171194 liftIO $ threadDelay 100000
11181195 mb <- receiveChanTimeout 0 rp
11191196 case mb of
1120− Just b -> do False <- return b; return ()
1197+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
11211198 _ -> loop
11221199
11231200 liftIO $ putMVar done ()
@@ -1154,8 +1231,8 @@ testReceiveChanFeatures TestTransport{..} = do
11541231
11551232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
11561233
1157− True <- receiveChan rp1
1158− False <- receiveChan rp1
1234+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
11591236
11601237 -- Test Applicative instance
11611238
@@ -1164,7 +1241,7 @@ testReceiveChanFeatures TestTransport{..} = do
11641241
11651242 let rp2 = pure (+) <*> rpInt <*> rpInt
11661243
1167− 7 <- receiveChan rp2
1244+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
11681245
11691246 -- Test Alternative instance
11701247
@@ -1173,8 +1250,8 @@ testReceiveChanFeatures TestTransport{..} = do
11731250
11741251 let rp3 = (even <$> rpInt) <|> rpBool
11751252
1176− False <- receiveChan rp3
1177− True <- receiveChan rp3
1253+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
11781255
11791256 -- Test Monad instance
11801257
@@ -1188,17 +1265,86 @@ testReceiveChanFeatures TestTransport{..} = do
11881265 then rpInt
11891266 else return 7
11901267
1191− 5 <- receiveChan rp4
1192− 7 <- receiveChan rp4
1268+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
11931270
11941271 liftIO $ putMVar done ()
11951272
11961273 takeMVar done
11971274
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+
11981345testKillLocal :: TestTransport -> Assertion
11991346testKillLocal TestTransport{..} = do
12001347 localNode <- newLocalNode testTransport initRemoteTable
1201− done <- newEmptyMVar
12021348
12031349 pid <- forkProcess localNode $ do
12041350 liftIO $ threadDelay 1000000
@@ -1207,17 +1353,18 @@ testKillLocal TestTransport{..} = do
12071353 ref <- monitor pid
12081354 us <- getSelfPid
12091355 kill pid "TestKill"
1210− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1211− True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1212− liftIO $ putMVar done ()
1213−
1214− 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"
12151363
12161364testKillRemote :: TestTransport -> Assertion
12171365testKillRemote TestTransport{..} = do
12181366 node1 <- newLocalNode testTransport initRemoteTable
12191367 node2 <- newLocalNode testTransport initRemoteTable
1220− done <- newEmptyMVar
12211368
12221369 pid <- forkProcess node1 $ do
12231370 liftIO $ threadDelay 1000000
@@ -1226,11 +1373,17 @@ testKillRemote TestTransport{..} = do
12261373 ref <- monitor pid
12271374 us <- getSelfPid
12281375 kill pid "TestKill"
1229− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1230− True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1231− liftIO $ putMVar done ()
1232−
1233− 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"
12341387
12351388testCatchesExit :: TestTransport -> Assertion
12361389testCatchesExit TestTransport{..} = do
@@ -1256,7 +1409,10 @@ testHandleMessageIf TestTransport{..} = do
12561409 self <- getSelfPid
12571410 send self (5 :: Integer, 10 :: Integer)
12581411 msg <- receiveWait [ matchMessage return ]
1259− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1412+ handleMessageIf msg
1413+ (\() -> True)
1414+ (\() -> die "whoops") >>= maybe (return ())
1415+ (const $ die "Expected Mismatch")
12601416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
12611417 (\input -> liftIO $ putMVar done input)
12621418 return ()
@@ -1301,8 +1457,11 @@ testDie TestTransport{..} = do
13011457 (die ("foobar", 123 :: Int))
13021458 `catchExit` \_from reason -> do
13031459 -- TODO: should verify that 'from' has the right value
1304− True <- return $ reason == ("foobar", 123 :: Int)
1460+ let res = reason == ("foobar", 123 :: Int)
13051461 liftIO $ putMVar done ()
1462+ if res
1463+ then return ()
1464+ else die "Something went horribly wrong"
13061465
13071466 takeMVar done
13081467
@@ -1316,8 +1475,11 @@ testPrettyExit TestTransport{..} = do
13161475 `catch` \ex@(ProcessExitException from _) ->
13171476 let expected = "exit-from=" ++ (show from)
13181477 in do
1319− True <- return $ (show ex) == expected
1478+ let res = (show ex) == expected
13201479 liftIO $ putMVar done ()
1480+ if res
1481+ then return ()
1482+ else die "Something went horribly wrong"
13211483
13221484 takeMVar done
13231485
@@ -1333,17 +1495,26 @@ testExitLocal TestTransport{..} = do
13331495 pid <- forkProcess localNode $ do
13341496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
13351497 -- TODO: should verify that 'from' has the right value
1336− True <- return $ reason == "TestExit"
1498+ res <- return $ reason == "TestExit"
13371499 liftIO $ putMVar supervisedDone ()
1500+ if res
1501+ then return ()
1502+ else die "Something went horribly wrong"
13381503
13391504 runProcess localNode $ do
13401505 liftIO $ takeMVar handlerSetUp
13411506 ref <- monitor pid
13421507 exit pid "TestExit"
13431508 -- This time the client catches the exception, so it dies normally
1344− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1345− True <- return $ ref == ref' && pid == pid'
1346− 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"
13471518
13481519 takeMVar supervisedDone
13491520 takeMVar supervisorDone
@@ -1359,132 +1530,97 @@ testExitRemote TestTransport{..} = do
13591530 (receiveWait [] :: Process ()) -- block forever
13601531 `catchExit` \_from reason -> do
13611532 -- TODO: should verify that 'from' has the right value
1362− True <- return $ reason == "TestExit"
1533+ res <- return $ reason == "TestExit"
13631534 liftIO $ putMVar supervisedDone ()
1535+ if res
1536+ then return ()
1537+ else die "Something went horribly wrong"
13641538
13651539 runProcess node2 $ do
13661540 ref <- monitor pid
13671541 exit pid "TestExit"
1368− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1369− True <- return $ ref == ref' && pid == pid'
1370− 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"
13711551
13721552 takeMVar supervisedDone
13731553 takeMVar supervisorDone
13741554
13751555testRegistryMonitoring :: TestTransport -> Assertion
13761556testRegistryMonitoring TestTransport{..} = do
1377− localNode <- newLocalNode testTransport initRemoteTable
1378− remoteNode <- newLocalNode testTransport initRemoteTable
1379− return ()
1557+ node1 <- newLocalNode testTransport initRemoteTable
1558+ node2 <- newLocalNode testTransport initRemoteTable
13801559
1381− -- Local process. Test if local process will be removed from
1382− -- registry when it dies.
1383− box <- newEmptyMVar
1384− runProcess localNode $ do
1385− pid <- spawnLocal $ do
1386− expect
1387− register "test" pid
1388− tpid <- whereis "test"
1389− if tpid == Just pid
1390− then do _ <- monitor pid
1391− send pid ()
1392− ProcessMonitorNotification{} <- expect
1393− tpid1 <- whereis "test"
1394− liftIO $ putMVar box (Nothing == tpid1)
1395− else liftIO $ putMVar box False
1396−
1397− takeMVar box >>= assertBool "expected local process to not be registered"
1398− return ()
1399−
1400− -- Remote process. Test if remote process entry is removed
1401− -- from registry when process dies.
1402− remote1 <- testRemote remoteNode
1403− runProcess localNode $
1404− let waitpoll = do
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))
1411− send remote1 ()
1412− waitpoll
1413− return ()
1414− return ()
1415−
1416− -- Many labels. Test if all labels associated with process
1417− -- are removed from registry when it dies.
1418− remote2 <- testRemote remoteNode
1419− remoteX <- testRemote remoteNode
1420− runProcess localNode $
1421− let waitpoll = do
1422− w1 <- whereis "test-3" :: Process (Maybe ProcessId)
1423− w2 <- whereis "test-4" :: Process (Maybe ProcessId)
1424− forM_ (w1 <|> w2) (const waitpoll)
1425− in do register "test-3" remote2
1426− register "test-4" remote2
1427− register "test-X" remoteX
1428− send remote2 ()
1429− waitpoll
1430− rX <- whereis "test-X"
1431− rX `shouldBe` (equalTo (Just remoteX))
1432− return ()
1433−
1434−{- XXX: waiting including patch for nsend for remote process
1435− remote3 <- testRemote remoteNode
1436− remote4 <- testRemote remoteNode
1437− -- test many labels
1438− runProcess localNode $ do
1439− register "test-3" remote3
1440− reregister "test-3" remote4
1441− send remote3 ()
1442− liftIO $ threadDelay 50000 -- XXX: racy
1443− monitor remote4
1444− nsend "test-3" ()
1445− ProcessMonitorNotification{} <- expect
1446− return ()
1447−-}
1448−
1449− -- Test registerRemoteAsync properties. Add a local process to
1450− -- remote registry and checks that it is removed
1451− -- when the process dies.
1452− remote5 <- testRemote remoteNode
1453− runProcess localNode $ do
1454− registerRemoteAsync (localNodeId remoteNode) "test" remote5
1455− receiveWait [
1456− match (\(RegisterReply _ True _) -> return ())
1457− ] >>= send remote5
1458− let waitpoll = do
1459− whereisRemoteAsync (localNodeId remoteNode) "test"
1460− receiveWait [
1461− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1462− ]
1463− 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"
14641567
1465− -- Add remote process to remote registry and checks if
1466− -- entry is removed then process is dead.
1467− remote6 <- testRemote localNode
1468− runProcess localNode $ do
1469− registerRemoteAsync (localNodeId remoteNode) "test" remote6
1470− receiveWait [
1471− match (\(RegisterReply _ True _) -> return ())
1472− ] >>= send remote6
1473− let waitpoll = do
1474− whereisRemoteAsync (localNodeId remoteNode) "test"
1475− receiveWait [
1476− match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1477− ]
1478− waitpoll
1479− where
1480− testRemote node = do
1481− -- test many labels
1482− pidBox <- newEmptyMVar
1483− forkProcess node $ do
1484− us <- getSelfPid
1485− liftIO $ putMVar pidBox us
1486− expect :: Process ()
1487− 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"
14881624
14891625testUnsafeSend :: TestTransport -> Assertion
14901626testUnsafeSend TestTransport{..} = do
@@ -1501,8 +1637,7 @@ testUnsafeSend TestTransport{..} = do
15011637 void $ forkProcess localNode $ do
15021638 serverPid <- liftIO $ takeMVar serverAddr
15031639 getSelfPid >>= unsafeSend serverPid
1504− () <- expect
1505− liftIO $ putMVar clientDone ()
1640+ expect >>= liftIO . putMVar clientDone
15061641
15071642 takeMVar clientDone
15081643
@@ -1521,8 +1656,7 @@ testUnsafeUSend TestTransport{..} = do
15211656 void $ forkProcess localNode $ do
15221657 serverPid <- liftIO $ takeMVar serverAddr
15231658 getSelfPid >>= unsafeUSend serverPid
1524− () <- expect
1525− liftIO $ putMVar clientDone ()
1659+ expect >>= liftIO . putMVar clientDone
15261660
15271661 takeMVar clientDone
15281662
@@ -1533,8 +1667,7 @@ testUnsafeNSend TestTransport{..} = do
15331667 localNode <- newLocalNode testTransport initRemoteTable
15341668
15351669 pid <- forkProcess localNode $ do
1536− () <- expect
1537− liftIO $ putMVar clientDone ()
1670+ expect >>= liftIO . putMVar clientDone
15381671
15391672 void $ runProcess localNode $ do
15401673 register "foobar" pid
@@ -1552,8 +1685,7 @@ testUnsafeNSendRemote TestTransport{..} = do
15521685 _ <- forkProcess localNode1 $ do
15531686 getSelfPid >>= register "foobar"
15541687 liftIO $ putMVar clientDone ()
1555− () <- expect
1556− liftIO $ putMVar clientDone ()
1688+ expect >>= liftIO . putMVar clientDone
15571689
15581690 takeMVar clientDone
15591691 void $ runProcess localNode2 $ do
@@ -1577,7 +1709,7 @@ testUnsafeSendChan TestTransport{..} = do
15771709 serverPid <- liftIO $ takeMVar serverAddr
15781710 (sp, rp) <- newChan
15791711 unsafeSend serverPid sp
1580− () <- receiveChan rp
1712+ receiveChan rp :: Process ()
15811713 liftIO $ putMVar clientDone ()
15821714
15831715 takeMVar clientDone
@@ -1591,8 +1723,8 @@ testCallLocal TestTransport{..} = do
15911723 runProcess node $ do
15921724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
15931725 liftIO $ putMVar result r
1594− True <- takeMVar result
1595− return ()
1726+
1727+ takeMVar result >>= assertBool "Expected 'True'"
15961728
15971729 -- Testing that when callLocal is interrupted, the worker is interrupted.
15981730 ibox <- newIORef False
@@ -1609,10 +1741,9 @@ testCallLocal TestTransport{..} = do
16091741 (send keeper ())
16101742 caller <- expect
16111743 exit caller "test"
1612− () <- expect
1613− return ()
1614− True <- readIORef ibox
1615− return ()
1744+ expect :: Process ()
1745+
1746+ readIORef ibox >>= assertBool "Expected 'True'"
16161747
16171748 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
16181749 ibox2 <- newIORef False
@@ -1621,8 +1752,8 @@ testCallLocal TestTransport{..} = do
16211752 liftIO $ writeIORef ibox2 $ case r of
16221753 Left (ErrorCall "e") -> True
16231754 _ -> False
1624− True <- readIORef ibox
1625− return ()
1755+
1756+ readIORef ibox >>= assertBool "Expected 'True'"
16261757
16271758 -- Test that caller waits for the worker in correct situation
16281759 ibox3 <- newIORef False
@@ -1639,8 +1770,8 @@ testCallLocal TestTransport{..} = do
16391770 liftIO $ putMVar result3 =<< readIORef ibox3
16401771 worker <- expect
16411772 send worker ()
1642− True <- takeMVar result3
1643− return ()
1773+
1774+ takeMVar result3 >>= assertBool "Expected 'True'"
16441775
16451776 -- Test that caller waits for the worker in case when caller gets an exception
16461777 ibox4 <- newIORef False
@@ -1656,13 +1787,9 @@ testCallLocal TestTransport{..} = do
16561787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
16571788 caller <- expect
16581789 exit caller "hi!"
1659− True <- takeMVar result4
1660− return ()
1661− -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1662−
1663−
1664−
16651790
1791+ takeMVar result4 >>= assertBool "Expected 'True'"
1792+ -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
16661793
16671794tests :: TestTransport -> IO [Test]
16681795tests testtrans = return [
@@ -1687,6 +1814,7 @@ tests testtrans = return [
16871814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
16881815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
16891816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
16901818 , testCase "KillLocal" (testKillLocal testtrans)
16911819 , testCase "KillRemote" (testKillRemote testtrans)
16921820 , testCase "Die" (testDie testtrans)
@@ -1696,7 +1824,7 @@ tests testtrans = return [
16961824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
16971825 , testCase "ExitLocal" (testExitLocal testtrans)
16981826 , testCase "ExitRemote" (testExitRemote testtrans)
1699− , testCase "TestRegistryMonitor" (testRegistryMonitoring testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
17001828 , testCase "TextCallLocal" (testCallLocal testtrans)
17011829 -- Unsafe Primitives
17021830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1749,17 +1877,3 @@ tests testtrans = return [
17491877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
17501878 ]
17511879 ]
1752−
1753−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1754−syncBreakConnection breakConnection nid0 nid1 = do
1755− m <- newEmptyMVar
1756− _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1757− runProcess nid0 $ do
1758− them <- liftIO $ takeMVar m
1759− pinger <- spawnLocal $ forever $ send them ()
1760− _ <- monitorNode (localNodeId nid1)
1761− liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1762− (nodeAddress $ localNodeId nid1)
1763− NodeMonitorNotification _ _ _ <- expect
1764− kill pinger "finished"
1765− return ()