@@ -42,12 +42,15 @@ import Control.Distributed.Process.Internal.Types
4242 , createUnencodedMessage
4343 )
4444import Control.Distributed.Process.Node
45+import Control.Distributed.Process.Debug
46+import Control.Distributed.Process.Management.Internal.Types
47+import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
4548import Control.Distributed.Process.Serializable (Serializable)
46−
47−import Test.HUnit (Assertion, assertFailure)
49+import Data.Maybe (isNothing, isJust)
50+import Test.HUnit (Assertion, assertBool, assertFailure)
4851import Test.Framework (Test, testGroup)
4952import Test.Framework.Providers.HUnit (testCase)
50−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
5154import Control.Rematch.Run (Match(..))
5255
5356newtype Ping = Ping ProcessId
@@ -80,12 +83,46 @@ ping = do
8083 send partner (Ping self)
8184 ping
8285
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+
8394-- | Quick and dirty synchronous version of whereisRemoteAsync
8495whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
8596whereisRemote nid string = do
8697 whereisRemoteAsync nid string
87− WhereIsReply _ mPid <- expect
88− 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 ()
89126
90127data Add = Add ProcessId Double Double deriving (Typeable)
91128data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -160,12 +197,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
160197 unmonitor ref
161198 liftIO $ putMVar done ()
162199 (False, ref) -> do
163− ProcessMonitorNotification ref' pid reason' <- expect
164− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
165− 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+ ]
166208 )
167209 (\(ProcessLinkException pid reason') -> do
168− 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')
169212 liftIO $ putMVar done ()
170213 )
171214
@@ -196,8 +239,10 @@ testPing TestTransport{..} = do
196239 pid <- getSelfPid
197240 replicateM_ numPings $ do
198241 send pingServer (Pong pid)
199− Ping _ <- expect
200− return ()
242+ p <- expectTimeout 3000000
243+ case p of
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
201246
202247 putMVar clientDone ()
203248
@@ -284,7 +329,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
284329 runProcess localNode $ do
285330 monitor theirAddr
286331 -- wait for the process to die
287− ProcessMonitorNotification _ _ _ <- expect
332+ expect :: Process ProcessMonitorNotification
288333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
289334
290335 takeMVar done
@@ -358,14 +403,17 @@ testMath TestTransport{..} = do
358403 runProcess localNode $ do
359404 pid <- getSelfPid
360405 send mathServer (Add pid 1 2)
361− 3 <- expect :: Process Double
406+ three <- expect :: Process Double
362407 send mathServer (Divide pid 8 2)
363− 4 <- expect :: Process Double
408+ four <- expect :: Process Double
364409 send mathServer (Divide pid 8 0)
365− DivByZero <- expect
366− liftIO $ putMVar clientDone ()
410+ divByZ <- expect
411+ liftIO $ putMVar clientDone (three, four, divByZ)
367412
368− takeMVar clientDone
413+ res <- takeMVar clientDone
414+ case res of
415+ (3, 4, DivByZero) -> return ()
416+ _ -> error $ "Something went horribly wrong"
369417
370418-- | Send first message (i.e. connect) to an already terminated process
371419-- (without monitoring); then send another message to a second process on
@@ -393,11 +441,9 @@ testSendToTerminated TestTransport{..} = do
393441 pid <- getSelfPid
394442 send server1 "Hi"
395443 send server2 (Pong pid)
396− Ping pid' <- expect
397− True <- return $ pid' == server2
398− liftIO $ putMVar clientDone ()
444+ expectPing clientDone
399445
400− takeMVar clientDone
446+ verifyClient "Expected Ping from server" clientDone
401447
402448-- | Test (non-zero) timeout
403449testTimeout :: TestTransport -> Assertion
@@ -406,10 +452,10 @@ testTimeout TestTransport{..} = do
406452 done <- newEmptyMVar
407453
408454 runProcess localNode $ do
409− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
410− liftIO $ putMVar done ()
455+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456+ liftIO $ putMVar done $ res == Nothing
411457
412− takeMVar done
458+ verifyClient "Expected receiveTimeout to timeout..." done
413459
414460-- | Test zero timeout
415461testTimeout0 :: TestTransport -> Assertion
@@ -437,10 +483,9 @@ testTimeout0 TestTransport{..} = do
437483 -- is not interested in, and then a single message that it wants
438484 replicateM_ 10000 $ send server "Irrelevant message"
439485 send server (Pong pid)
440− Ping _ <- expect
441− liftIO $ putMVar clientDone ()
486+ expectPing clientDone
442487
443− takeMVar clientDone
488+ verifyClient "Expected Ping from server" clientDone
444489
445490-- | Test typed channels
446491testTypedChannels :: TestTransport -> Assertion
@@ -463,10 +508,10 @@ testTypedChannels TestTransport{..} = do
463508 runProcess localNode $ do
464509 (clientSendPort, rport) <- newChan
465510 sendChan serverSendPort (clientSendPort, 5)
466− False <- receiveChan rport
467− liftIO $ putMVar clientDone ()
511+ ch <- receiveChan rport
512+ liftIO $ putMVar clientDone $ ch == False
468513
469− takeMVar clientDone
514+ verifyClient "Expected channel to send 'False'" clientDone
470515
471516-- | Test merging receive ports
472517testMergeChannels :: TestTransport -> Assertion
@@ -489,9 +534,8 @@ testMergeChannels TestTransport{..} = do
489534 rs <- mapM charChannel "abc"
490535 m <- mergePorts biased rs
491536 xs <- replicateM 9 $ receiveChan m
492− True <- return $ xs == expected
493− liftIO $ putMVar done ()
494− takeMVar done
537+ liftIO $ putMVar done $ xs == expected
538+ verifyClient "Expected single layer merge to match expected ordering" done
495539
496540 -- Two layers of merging
497541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -502,9 +546,8 @@ testMergeChannels TestTransport{..} = do
502546 ms <- mapM (mergePorts biasedInner) rss
503547 m <- mergePorts biasedOuter ms
504548 xs <- replicateM (9 * 3) $ receiveChan m
505− True <- return $ xs == expected
506− liftIO $ putMVar done ()
507− takeMVar done
549+ liftIO $ putMVar done $ xs == expected
550+ verifyClient "Expected nested channels to match expeted ordering" done
508551
509552 -- Test that if no messages are (immediately) available, the scheduler makes no difference
510553 testBlocked :: LocalNode -> Bool -> IO ()
@@ -513,43 +556,45 @@ testMergeChannels TestTransport{..} = do
513556 done <- newEmptyMVar
514557
515558 forkProcess localNode $ do
516− [sa, sb, sc] <- liftIO $ mapM readMVar vs
517− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
518− [ -- a, b, c
519− (sa, 'a')
520− , (sb, 'b')
521− , (sc, 'c')
522− -- a, c, b
523− , (sa, 'a')
524− , (sc, 'c')
525− , (sb, 'b')
526− -- b, a, c
527− , (sb, 'b')
528− , (sa, 'a')
529− , (sc, 'c')
530− -- b, c, a
531− , (sb, 'b')
532− , (sc, 'c')
533− , (sa, 'a')
534− -- c, a, b
535− , (sc, 'c')
536− , (sa, 'a')
537− , (sb, 'b')
538− -- c, b, a
539− , (sc, 'c')
540− , (sb, 'b')
541− , (sa, 'a')
542− ]
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"
543589
544590 forkProcess localNode $ do
545591 (ss, rs) <- unzip <$> replicateM 3 newChan
546592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
547593 m <- mergePorts biased rs
548594 xs <- replicateM (6 * 3) $ receiveChan m
549− True <- return $ xs == "abcacbbacbcacabcba"
550− liftIO $ putMVar done ()
595+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
551596
552− takeMVar done
597+ verifyClient "Expected merged ports to match expected ordering" done
553598
554599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
555600 mergePorts True = mergePortsBiased
@@ -567,8 +612,9 @@ testTerminate TestTransport{..} = do
567612 localNode <- newLocalNode testTransport initRemoteTable
568613 runProcess localNode $ do
569614 e <- try terminate :: Process (Either ProcessTerminationException ())
570− True <- return $ either show show e == show ProcessTerminationException
571− return ()
615+ if either show show e == show ProcessTerminationException
616+ then return ()
617+ else die "Unexpected result from terminate"
572618
573619testMonitorNode :: TestTransport -> Assertion
574620testMonitorNode TestTransport{..} = do
@@ -579,11 +625,12 @@ testMonitorNode TestTransport{..} = do
579625
580626 runProcess node2 $ do
581627 ref <- monitorNode (localNodeId node1)
582− NodeMonitorNotification ref' nid DiedDisconnect <- expect
583− True <- return $ ref == ref' && nid == localNodeId node1
584− liftIO $ putMVar done ()
628+ receiveWait [
629+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630+ return $ ref == ref' && nid == localNodeId node1)
631+ ] >>= liftIO . putMVar done
585632
586− takeMVar done
633+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
587634
588635testMonitorLiveNode :: TestTransport -> Assertion
589636testMonitorLiveNode TestTransport{..} = do
@@ -598,15 +645,16 @@ testMonitorLiveNode TestTransport{..} = do
598645 liftIO $ putMVar ready ()
599646 liftIO $ takeMVar readyr
600647 send p ()
601− NodeMonitorNotification ref' nid _ <- expect
602− True <- return $ ref == ref' && nid == localNodeId node1
603− liftIO $ putMVar done ()
648+ receiveWait [
649+ match (\(NodeMonitorNotification ref' nid _) ->
650+ (return $ ref == ref' && nid == localNodeId node1))
651+ ] >>= liftIO . putMVar done
604652
605653 takeMVar ready
606654 closeLocalNode node1
607655 putMVar readyr ()
608656
609− takeMVar done
657+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
610658
611659testMonitorChannel :: TestTransport -> Assertion
612660testMonitorChannel TestTransport{..} = do
@@ -616,18 +664,20 @@ testMonitorChannel TestTransport{..} = do
616664 pid <- forkProcess node1 $ do
617665 sport <- expect :: Process (SendPort ())
618666 ref <- monitorPort sport
619− PortMonitorNotification ref' port' reason <- expect
620− -- reason might be DiedUnknownId if the receive port is GCed before the
621− -- monitor is established (TODO: not sure that this is reasonable)
622− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
623− 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
624674
625675 runProcess node2 $ do
626676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
627677 send pid sport
628678 liftIO $ threadDelay 100000
629679
630− takeMVar gotNotification
680+ verifyClient "Expected PortMonitorNotification" gotNotification
631681
632682testRegistry :: TestTransport -> Assertion
633683testRegistry TestTransport{..} = do
@@ -639,20 +689,28 @@ testRegistry TestTransport{..} = do
639689
640690 runProcess node $ do
641691 register "ping" pingServer
642− Just pid <- whereis "ping"
643− True <- return $ pingServer == pid
692+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
644693 us <- getSelfPid
645694 nsend "ping" (Pong us)
646− Ping pid' <- expect
647− True <- return $ pingServer == pid'
648− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
649− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
650− True <- return $ x == pingServer
651− 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
652701 liftIO $ putMVar done ()
653702
654703 takeMVar done
655704
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+
656714testRegistryRemoteProcess :: TestTransport -> Assertion
657715testRegistryRemoteProcess TestTransport{..} = do
658716 node1 <- newLocalNode testTransport initRemoteTable
@@ -663,13 +721,13 @@ testRegistryRemoteProcess TestTransport{..} = do
663721
664722 runProcess node2 $ do
665723 register "ping" pingServer
666− Just pid <- whereis "ping"
667− True <- return $ pingServer == pid
724+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
668725 us <- getSelfPid
669726 nsend "ping" (Pong us)
670− Ping pid' <- expect
671− True <- return $ pingServer == pid'
672− liftIO $ putMVar done ()
727+ receiveWait [
728+ matchIf (\(Ping pid') -> pingServer == pid')
729+ (const $ liftIO $ putMVar done ())
730+ ]
673731
674732 takeMVar done
675733
@@ -677,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
677735testRemoteRegistry TestTransport{..} = do
678736 node1 <- newLocalNode testTransport initRemoteTable
679737 node2 <- newLocalNode testTransport initRemoteTable
680− done <- newEmptyMVar
681738
682739 pingServer <- forkProcess node1 ping
683740 deadProcess <- forkProcess node1 (return ())
@@ -690,32 +747,34 @@ testRemoteRegistry TestTransport{..} = do
690747 "ping" == label' && pid == pingServer)
691748 (\(RegisterReply _ _ _) -> return ()) ]
692749
693− Just pid <- whereisRemote nid1 "ping"
694− True <- return $ pingServer == pid
750+ pid <- verifyWhereIsRemote nid1 "ping"
751+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752+
695753 us <- getSelfPid
696754 nsendRemote nid1 "ping" (Pong us)
697− Ping pid' <- expect
698− True <- return $ pingServer == pid'
755+ receiveWait [
756+ match (\(Ping pid') -> return $ pingServer == pid')
757+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
699758
700759 -- test that if process was not registered Nothing is returned
701760 -- in owner field.
702761 registerRemoteAsync nid1 "dead" deadProcess
703− receiveWait [
704− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
705− (\(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+
706766 registerRemoteAsync nid1 "ping" deadProcess
707767 receiveWait [
708− matchIf (\(RegisterReply label' False (Just pid'')) ->
709− "ping" == label' && pid'' == pingServer)
710− (\(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+
711773 unregisterRemoteAsync nid1 "dead"
712774 receiveWait [
713− matchIf (\(RegisterReply label' False Nothing) ->
714− "dead" == label' && pid == pingServer)
715− (\(RegisterReply _ _ _) -> return ()) ]
716− liftIO $ putMVar done ()
717−
718− 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"
719778
720779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
721780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -731,15 +790,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
731790 receiveWait [
732791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
733792 (\(RegisterReply _ _ _) -> return ()) ]
734− Just pid <- whereisRemote nid1 "ping"
735− True <- return $ pingServer == pid
793+ pid <- verifyWhereIsRemote nid1 "ping"
794+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
736795 us <- getSelfPid
737796 nsendRemote nid1 "ping" (Pong us)
738− Ping pid' <- expect
739− True <- return $ pingServer == pid'
740− liftIO $ putMVar done ()
797+ receiveWait [
798+ match (\(Ping pid') -> return $ pingServer == pid')
799+ ] >>= liftIO . putMVar done
741800
742− takeMVar done
801+ verifyClient "Expected Ping with ping server's ProcessId" done
743802
744803testSpawnLocal :: TestTransport -> Assertion
745804testSpawnLocal TestTransport{..} = do
@@ -753,15 +812,14 @@ testSpawnLocal TestTransport{..} = do
753812 sport <- expect
754813 sendChan sport (1234 :: Int)
755814
756− sport <- spawnChannelLocal $ \rport -> do
757− (1234 :: Int) <- receiveChan rport
758− send us ()
815+ sport <- spawnChannelLocal $
816+ \rport -> (receiveChan rport :: Process Int) >>= send us
759817
760818 send pid sport
761− () <- expect
762− liftIO $ putMVar done ()
819+ expect >>= liftIO . putMVar done
763820
764− takeMVar done
821+ res <- takeMVar done
822+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
765823
766824testSpawnAsyncStrictness :: TestTransport -> Assertion
767825testSpawnAsyncStrictness TestTransport{..} = do
@@ -790,8 +848,9 @@ testReconnect TestTransport{..} = do
790848 liftIO $ putMVar processA us
791849 msg1 <- expect
792850 msg2 <- expect
793− True <- return $ msg1 == "message 1" && msg2 == "message 3"
794− liftIO $ putMVar sendTestOk ()
851+ liftIO $ do
852+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853+ putMVar sendTestOk ()
795854
796855 forkProcess node2 $ do
797856 {-
@@ -824,7 +883,7 @@ testReconnect TestTransport{..} = do
824883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
825884 (\(RegisterReply _ _ _) -> return ()) ]
826885
827− Just _ <- whereisRemote nid1 "a"
886+ _ <- whereisRemote nid1 "a"
828887
829888
830889 -- Simulate network failure
@@ -843,9 +902,10 @@ testReconnect TestTransport{..} = do
843902 (\(RegisterReply _ _ _) -> return ()) ]
844903
845904 -- Check
846− Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
847− Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
848− 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"
849909
850910 liftIO $ putMVar registerTestOk ()
851911
@@ -886,19 +946,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
886946 isSorted _ = True
887947 -- The list can't be null since there are no failures after sending
888948 -- the last message.
889− True <- return $ isSorted msgs && not (null msgs)
890− liftIO $ putMVar usendTestOk ()
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
891950
892951 forkProcess node2 $ do
893952 them <- liftIO $ readMVar processA
894953 getSelfPid >>= send them
895− () <- expect
954+ expect :: Process ()
896955 forM_ [1..numMessages] $ \i -> do
897956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
898957 usendPrim them i
899958 liftIO (threadDelay 30000)
900959
901− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
902962
903963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
904964-- in between
@@ -924,14 +984,17 @@ testMatchAny TestTransport{..} = do
924984 runProcess localNode $ do
925985 pid <- getSelfPid
926986 send mathServer (Add pid 1 2)
927− 3 <- expect :: Process Double
987+ three <- expect :: Process Double
928988 send mathServer (Divide pid 8 2)
929− 4 <- expect :: Process Double
989+ four <- expect :: Process Double
930990 send mathServer (Divide pid 8 0)
931− DivByZero <- expect
932− liftIO $ putMVar clientDone ()
991+ divByZ <- expect
992+ liftIO $ putMVar clientDone (three, four, divByZ)
933993
934− takeMVar clientDone
994+ res <- takeMVar clientDone
995+ case res of
996+ (3, 4, DivByZero) -> return ()
997+ _ -> error "Unexpected result"
935998
936999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
9371000-- in between, however we block 'Divide' requests ....
@@ -958,12 +1021,13 @@ testMatchAnyHandle TestTransport{..} = do
9581021 runProcess localNode $ do
9591022 pid <- getSelfPid
9601023 send mathServer (Add pid 1 2)
961− 3 <- expect :: Process Double
1024+ three <- expect :: Process Double
9621025 send mathServer (Divide pid 8 2)
963− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
964− 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
9651030
966− takeMVar clientDone
9671031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
9681032 maybeForward s msg =
9691033 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -991,8 +1055,10 @@ testMatchAnyNoHandle TestTransport{..} = do
9911055 Just _ -> die "NONSENSE")
9921056 ]
9931057 -- we *must* have removed the message from our mailbox though!!!
994− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
995− liftIO $ putMVar serverDone ()
1058+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1059+ liftIO $ do
1060+ assertBool "Expected timeout!" $ res == Nothing
1061+ putMVar serverDone ()
9961062 putMVar addr server
9971063
9981064 -- Client
@@ -1035,14 +1101,21 @@ testMatchAnyIf TestTransport{..} = do
10351101 runProcess localNode $ do
10361102 pid <- getSelfPid
10371103 send server (pid, "foo")
1038− "foo" <- expect
1039− send server (pid, "baz")
1040− "baz" <- expect
1104+ foo <- expect
1105+ -- provoking what would be the wrong ordering is informative here...
1106+
10411107 send server (pid, "bar")
1042− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1043− 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'
10441118
1045− takeMVar clientDone
10461119 where tryHandleMessage :: Message -> Process (Maybe ())
10471120 tryHandleMessage msg =
10481121 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1075,12 +1148,13 @@ testMatchMessageWithUnwrap TestTransport{..} = do
10751148 runProcess localNode $ do
10761149 pid <- getSelfPid
10771150 send server (pid, wrapMessage ("foo" :: String))
1078− "foo" <- expect
1151+ foo <- expect
10791152 send server (pid, wrapMessage ("baz" :: String))
1080− "baz" <- expect
1081− liftIO $ putMVar clientDone ()
1153+ baz <- expect
1154+ liftIO $ putMVar clientDone (foo, baz)
10821155
1083− takeMVar clientDone
1156+ res <- takeMVar clientDone
1157+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
10841158
10851159-- Test 'receiveChanTimeout'
10861160testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1098,18 +1172,19 @@ testReceiveChanTimeout TestTransport{..} = do
10981172
10991173 -- Wait for a message with a delay. No message arrives, we should get
11001174 -- Nothing after the delay.
1101− Nothing <- receiveChanTimeout 100000 rp
1175+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
11021176
11031177 -- Let the sender know that it can send a message.
11041178 liftIO $ putMVar mvSender ()
11051179
11061180 -- Wait for a message with a delay again. Now a message arrives after
11071181 -- 0.1 seconds
1108− Just True <- receiveChanTimeout 20000000 rp
1182+ res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1183+ liftIO $ assertBool "Expected result to be 'True'" res
11091184
11101185 -- Wait for a message with zero timeout: non-blocking check. No message is
11111186 -- available, we get Nothing
1112− Nothing <- receiveChanTimeout 0 rp
1187+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
11131188
11141189 -- Let the sender know that it can send a message.
11151190 liftIO $ putMVar mvSender ()
@@ -1119,7 +1194,7 @@ testReceiveChanTimeout TestTransport{..} = do
11191194 liftIO $ threadDelay 100000
11201195 mb <- receiveChanTimeout 0 rp
11211196 case mb of
1122− Just b -> do False <- return b; return ()
1197+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
11231198 _ -> loop
11241199
11251200 liftIO $ putMVar done ()
@@ -1156,8 +1231,8 @@ testReceiveChanFeatures TestTransport{..} = do
11561231
11571232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
11581233
1159− True <- receiveChan rp1
1160− False <- receiveChan rp1
1234+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
11611236
11621237 -- Test Applicative instance
11631238
@@ -1166,7 +1241,7 @@ testReceiveChanFeatures TestTransport{..} = do
11661241
11671242 let rp2 = pure (+) <*> rpInt <*> rpInt
11681243
1169− 7 <- receiveChan rp2
1244+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
11701245
11711246 -- Test Alternative instance
11721247
@@ -1175,8 +1250,8 @@ testReceiveChanFeatures TestTransport{..} = do
11751250
11761251 let rp3 = (even <$> rpInt) <|> rpBool
11771252
1178− False <- receiveChan rp3
1179− True <- receiveChan rp3
1253+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
11801255
11811256 -- Test Monad instance
11821257
@@ -1190,17 +1265,86 @@ testReceiveChanFeatures TestTransport{..} = do
11901265 then rpInt
11911266 else return 7
11921267
1193− 5 <- receiveChan rp4
1194− 7 <- receiveChan rp4
1268+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
11951270
11961271 liftIO $ putMVar done ()
11971272
11981273 takeMVar done
11991274
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+
12001345testKillLocal :: TestTransport -> Assertion
12011346testKillLocal TestTransport{..} = do
12021347 localNode <- newLocalNode testTransport initRemoteTable
1203− done <- newEmptyMVar
12041348
12051349 pid <- forkProcess localNode $ do
12061350 liftIO $ threadDelay 1000000
@@ -1209,17 +1353,18 @@ testKillLocal TestTransport{..} = do
12091353 ref <- monitor pid
12101354 us <- getSelfPid
12111355 kill pid "TestKill"
1212− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1213− True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1214− liftIO $ putMVar done ()
1215−
1216− 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"
12171363
12181364testKillRemote :: TestTransport -> Assertion
12191365testKillRemote TestTransport{..} = do
12201366 node1 <- newLocalNode testTransport initRemoteTable
12211367 node2 <- newLocalNode testTransport initRemoteTable
1222− done <- newEmptyMVar
12231368
12241369 pid <- forkProcess node1 $ do
12251370 liftIO $ threadDelay 1000000
@@ -1228,11 +1373,17 @@ testKillRemote TestTransport{..} = do
12281373 ref <- monitor pid
12291374 us <- getSelfPid
12301375 kill pid "TestKill"
1231− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1232− True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1233− liftIO $ putMVar done ()
1234−
1235− 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"
12361387
12371388testCatchesExit :: TestTransport -> Assertion
12381389testCatchesExit TestTransport{..} = do
@@ -1258,7 +1409,10 @@ testHandleMessageIf TestTransport{..} = do
12581409 self <- getSelfPid
12591410 send self (5 :: Integer, 10 :: Integer)
12601411 msg <- receiveWait [ matchMessage return ]
1261− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1412+ handleMessageIf msg
1413+ (\() -> True)
1414+ (\() -> die "whoops") >>= maybe (return ())
1415+ (const $ die "Expected Mismatch")
12621416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
12631417 (\input -> liftIO $ putMVar done input)
12641418 return ()
@@ -1303,8 +1457,11 @@ testDie TestTransport{..} = do
13031457 (die ("foobar", 123 :: Int))
13041458 `catchExit` \_from reason -> do
13051459 -- TODO: should verify that 'from' has the right value
1306− True <- return $ reason == ("foobar", 123 :: Int)
1460+ let res = reason == ("foobar", 123 :: Int)
13071461 liftIO $ putMVar done ()
1462+ if res
1463+ then return ()
1464+ else die "Something went horribly wrong"
13081465
13091466 takeMVar done
13101467
@@ -1318,8 +1475,11 @@ testPrettyExit TestTransport{..} = do
13181475 `catch` \ex@(ProcessExitException from _) ->
13191476 let expected = "exit-from=" ++ (show from)
13201477 in do
1321− True <- return $ (show ex) == expected
1478+ let res = (show ex) == expected
13221479 liftIO $ putMVar done ()
1480+ if res
1481+ then return ()
1482+ else die "Something went horribly wrong"
13231483
13241484 takeMVar done
13251485
@@ -1335,17 +1495,26 @@ testExitLocal TestTransport{..} = do
13351495 pid <- forkProcess localNode $ do
13361496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
13371497 -- TODO: should verify that 'from' has the right value
1338− True <- return $ reason == "TestExit"
1498+ res <- return $ reason == "TestExit"
13391499 liftIO $ putMVar supervisedDone ()
1500+ if res
1501+ then return ()
1502+ else die "Something went horribly wrong"
13401503
13411504 runProcess localNode $ do
13421505 liftIO $ takeMVar handlerSetUp
13431506 ref <- monitor pid
13441507 exit pid "TestExit"
13451508 -- This time the client catches the exception, so it dies normally
1346− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1347− True <- return $ ref == ref' && pid == pid'
1348− 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"
13491518
13501519 takeMVar supervisedDone
13511520 takeMVar supervisorDone
@@ -1361,19 +1530,98 @@ testExitRemote TestTransport{..} = do
13611530 (receiveWait [] :: Process ()) -- block forever
13621531 `catchExit` \_from reason -> do
13631532 -- TODO: should verify that 'from' has the right value
1364− True <- return $ reason == "TestExit"
1533+ res <- return $ reason == "TestExit"
13651534 liftIO $ putMVar supervisedDone ()
1535+ if res
1536+ then return ()
1537+ else die "Something went horribly wrong"
13661538
13671539 runProcess node2 $ do
13681540 ref <- monitor pid
13691541 exit pid "TestExit"
1370− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1371− True <- return $ ref == ref' && pid == pid'
1372− 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"
13731551
13741552 takeMVar supervisedDone
13751553 takeMVar supervisorDone
13761554
1555+testRegistryMonitoring :: TestTransport -> Assertion
1556+testRegistryMonitoring TestTransport{..} = do
1557+ node1 <- newLocalNode testTransport initRemoteTable
1558+ node2 <- newLocalNode testTransport initRemoteTable
1559+
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"
1567+
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"
1624+
13771625testUnsafeSend :: TestTransport -> Assertion
13781626testUnsafeSend TestTransport{..} = do
13791627 serverAddr <- newEmptyMVar
@@ -1389,8 +1637,7 @@ testUnsafeSend TestTransport{..} = do
13891637 void $ forkProcess localNode $ do
13901638 serverPid <- liftIO $ takeMVar serverAddr
13911639 getSelfPid >>= unsafeSend serverPid
1392− () <- expect
1393− liftIO $ putMVar clientDone ()
1640+ expect >>= liftIO . putMVar clientDone
13941641
13951642 takeMVar clientDone
13961643
@@ -1409,8 +1656,7 @@ testUnsafeUSend TestTransport{..} = do
14091656 void $ forkProcess localNode $ do
14101657 serverPid <- liftIO $ takeMVar serverAddr
14111658 getSelfPid >>= unsafeUSend serverPid
1412− () <- expect
1413− liftIO $ putMVar clientDone ()
1659+ expect >>= liftIO . putMVar clientDone
14141660
14151661 takeMVar clientDone
14161662
@@ -1421,8 +1667,7 @@ testUnsafeNSend TestTransport{..} = do
14211667 localNode <- newLocalNode testTransport initRemoteTable
14221668
14231669 pid <- forkProcess localNode $ do
1424− () <- expect
1425− liftIO $ putMVar clientDone ()
1670+ expect >>= liftIO . putMVar clientDone
14261671
14271672 void $ runProcess localNode $ do
14281673 register "foobar" pid
@@ -1440,8 +1685,7 @@ testUnsafeNSendRemote TestTransport{..} = do
14401685 _ <- forkProcess localNode1 $ do
14411686 getSelfPid >>= register "foobar"
14421687 liftIO $ putMVar clientDone ()
1443− () <- expect
1444− liftIO $ putMVar clientDone ()
1688+ expect >>= liftIO . putMVar clientDone
14451689
14461690 takeMVar clientDone
14471691 void $ runProcess localNode2 $ do
@@ -1465,7 +1709,7 @@ testUnsafeSendChan TestTransport{..} = do
14651709 serverPid <- liftIO $ takeMVar serverAddr
14661710 (sp, rp) <- newChan
14671711 unsafeSend serverPid sp
1468− () <- receiveChan rp
1712+ receiveChan rp :: Process ()
14691713 liftIO $ putMVar clientDone ()
14701714
14711715 takeMVar clientDone
@@ -1479,8 +1723,8 @@ testCallLocal TestTransport{..} = do
14791723 runProcess node $ do
14801724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
14811725 liftIO $ putMVar result r
1482− True <- takeMVar result
1483− return ()
1726+
1727+ takeMVar result >>= assertBool "Expected 'True'"
14841728
14851729 -- Testing that when callLocal is interrupted, the worker is interrupted.
14861730 ibox <- newIORef False
@@ -1497,10 +1741,9 @@ testCallLocal TestTransport{..} = do
14971741 (send keeper ())
14981742 caller <- expect
14991743 exit caller "test"
1500− () <- expect
1501− return ()
1502− True <- readIORef ibox
1503− return ()
1744+ expect :: Process ()
1745+
1746+ readIORef ibox >>= assertBool "Expected 'True'"
15041747
15051748 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
15061749 ibox2 <- newIORef False
@@ -1509,8 +1752,8 @@ testCallLocal TestTransport{..} = do
15091752 liftIO $ writeIORef ibox2 $ case r of
15101753 Left (ErrorCall "e") -> True
15111754 _ -> False
1512− True <- readIORef ibox
1513− return ()
1755+
1756+ readIORef ibox >>= assertBool "Expected 'True'"
15141757
15151758 -- Test that caller waits for the worker in correct situation
15161759 ibox3 <- newIORef False
@@ -1527,8 +1770,8 @@ testCallLocal TestTransport{..} = do
15271770 liftIO $ putMVar result3 =<< readIORef ibox3
15281771 worker <- expect
15291772 send worker ()
1530− True <- takeMVar result3
1531− return ()
1773+
1774+ takeMVar result3 >>= assertBool "Expected 'True'"
15321775
15331776 -- Test that caller waits for the worker in case when caller gets an exception
15341777 ibox4 <- newIORef False
@@ -1544,13 +1787,9 @@ testCallLocal TestTransport{..} = do
15441787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
15451788 caller <- expect
15461789 exit caller "hi!"
1547− True <- takeMVar result4
1548− return ()
1549− -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1550−
1551−
1552−
15531790
1791+ takeMVar result4 >>= assertBool "Expected 'True'"
1792+ -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
15541793
15551794tests :: TestTransport -> IO [Test]
15561795tests testtrans = return [
@@ -1575,6 +1814,7 @@ tests testtrans = return [
15751814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
15761815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
15771816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
15781818 , testCase "KillLocal" (testKillLocal testtrans)
15791819 , testCase "KillRemote" (testKillRemote testtrans)
15801820 , testCase "Die" (testDie testtrans)
@@ -1584,6 +1824,7 @@ tests testtrans = return [
15841824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
15851825 , testCase "ExitLocal" (testExitLocal testtrans)
15861826 , testCase "ExitRemote" (testExitRemote testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
15871828 , testCase "TextCallLocal" (testCallLocal testtrans)
15881829 -- Unsafe Primitives
15891830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1636,17 +1877,3 @@ tests testtrans = return [
16361877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
16371878 ]
16381879 ]
1639−
1640−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1641−syncBreakConnection breakConnection nid0 nid1 = do
1642− m <- newEmptyMVar
1643− _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1644− runProcess nid0 $ do
1645− them <- liftIO $ takeMVar m
1646− pinger <- spawnLocal $ forever $ send them ()
1647− _ <- monitorNode (localNodeId nid1)
1648− liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1649− (nodeAddress $ localNodeId nid1)
1650− NodeMonitorNotification _ _ _ <- expect
1651− kill pinger "finished"
1652− return ()