@@ -9,6 +9,7 @@ import Network.Transport.Test (TestTransport(..))
99import Data.Binary (Binary(..))
1010import Data.Typeable (Typeable)
1111import Data.Foldable (forM_)
12+import Data.Function (fix)
1213import Data.IORef
1314 ( readIORef
1415 , writeIORef
@@ -24,24 +25,32 @@ import Control.Concurrent.MVar
2425 )
2526import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
2627import Control.Exception (SomeException, throwIO, ErrorCall(..))
27−import qualified Control.Exception as Ex (catch)
28−import Control.Applicative ((<$>), (<*>), pure, (<|>))
28+import Control.Monad.Catch (try, catch, finally, mask, onException)
29+import Control.Applicative ((<|>))
2930import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
30−import Control.Distributed.Process
31+import Control.Distributed.Process hiding
32+ ( try
33+ , catch
34+ , finally
35+ , mask
36+ , onException
37+ )
3138import Control.Distributed.Process.Internal.Types
32− ( NodeId(nodeAddress)
33− , LocalNode(localEndPoint)
39+ ( LocalNode(localEndPoint)
3440 , ProcessExitException(..)
3541 , nullProcessId
3642 , createUnencodedMessage
3743 )
3844import 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)
3948import Control.Distributed.Process.Serializable (Serializable)
40−
41−import Test.HUnit (Assertion, assertFailure)
49+import Data.Maybe (isNothing, isJust)
50+import Test.HUnit (Assertion, assertBool, assertFailure)
4251import Test.Framework (Test, testGroup)
4352import Test.Framework.Providers.HUnit (testCase)
44−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
4554import Control.Rematch.Run (Match(..))
4655
4756newtype Ping = Ping ProcessId
@@ -64,7 +73,7 @@ expectThat a matcher = case res of
6473forkTry :: IO () -> IO ThreadId
6574forkTry p = do
6675 tid <- myThreadId
67− forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
76+ forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
6877
6978-- | The ping server from the paper
7079ping :: Process ()
@@ -74,12 +83,46 @@ ping = do
7483 send partner (Ping self)
7584 ping
7685
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+
7794-- | Quick and dirty synchronous version of whereisRemoteAsync
7895whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
7996whereisRemote nid string = do
8097 whereisRemoteAsync nid string
81− WhereIsReply _ mPid <- expect
82− 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 ()
83126
84127data Add = Add ProcessId Double Double deriving (Typeable)
85128data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -154,12 +197,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
154197 unmonitor ref
155198 liftIO $ putMVar done ()
156199 (False, ref) -> do
157− ProcessMonitorNotification ref' pid reason' <- expect
158− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
159− 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+ ]
160208 )
161209 (\(ProcessLinkException pid reason') -> do
162− 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')
163212 liftIO $ putMVar done ()
164213 )
165214
@@ -190,8 +239,10 @@ testPing TestTransport{..} = do
190239 pid <- getSelfPid
191240 replicateM_ numPings $ do
192241 send pingServer (Pong pid)
193− Ping _ <- expect
194− return ()
242+ p <- expectTimeout 3000000
243+ case p of
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
195246
196247 putMVar clientDone ()
197248
@@ -278,7 +329,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
278329 runProcess localNode $ do
279330 monitor theirAddr
280331 -- wait for the process to die
281− ProcessMonitorNotification _ _ _ <- expect
332+ expect :: Process ProcessMonitorNotification
282333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
283334
284335 takeMVar done
@@ -352,14 +403,17 @@ testMath TestTransport{..} = do
352403 runProcess localNode $ do
353404 pid <- getSelfPid
354405 send mathServer (Add pid 1 2)
355− 3 <- expect :: Process Double
406+ three <- expect :: Process Double
356407 send mathServer (Divide pid 8 2)
357− 4 <- expect :: Process Double
408+ four <- expect :: Process Double
358409 send mathServer (Divide pid 8 0)
359− DivByZero <- expect
360− liftIO $ putMVar clientDone ()
410+ divByZ <- expect
411+ liftIO $ putMVar clientDone (three, four, divByZ)
361412
362− takeMVar clientDone
413+ res <- takeMVar clientDone
414+ case res of
415+ (3, 4, DivByZero) -> return ()
416+ _ -> error $ "Something went horribly wrong"
363417
364418-- | Send first message (i.e. connect) to an already terminated process
365419-- (without monitoring); then send another message to a second process on
@@ -387,11 +441,9 @@ testSendToTerminated TestTransport{..} = do
387441 pid <- getSelfPid
388442 send server1 "Hi"
389443 send server2 (Pong pid)
390− Ping pid' <- expect
391− True <- return $ pid' == server2
392− liftIO $ putMVar clientDone ()
444+ expectPing clientDone
393445
394− takeMVar clientDone
446+ verifyClient "Expected Ping from server" clientDone
395447
396448-- | Test (non-zero) timeout
397449testTimeout :: TestTransport -> Assertion
@@ -400,26 +452,24 @@ testTimeout TestTransport{..} = do
400452 done <- newEmptyMVar
401453
402454 runProcess localNode $ do
403− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
404− liftIO $ putMVar done ()
455+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456+ liftIO $ putMVar done $ res == Nothing
405457
406− takeMVar done
458+ verifyClient "Expected receiveTimeout to timeout..." done
407459
408460-- | Test zero timeout
409461testTimeout0 :: TestTransport -> Assertion
410462testTimeout0 TestTransport{..} = do
411463 serverAddr <- newEmptyMVar
412464 clientDone <- newEmptyMVar
413− messagesSent <- newEmptyMVar
414465
415466 forkIO $ do
416467 localNode <- newLocalNode testTransport initRemoteTable
417468 addr <- forkProcess localNode $ do
418− liftIO $ readMVar messagesSent >> threadDelay 1000000
419469 -- Variation on the venerable ping server which uses a zero timeout
420− -- Since we wait for all messages to be sent before doing this receive,
421− -- we should nevertheless find the right message immediately
422− Just partner <- receiveTimeout 0 [match (\(Pong partner) -> return partner)]
470+ partner <- fix $ \loop ->
471+ receiveTimeout 0 [match (\(Pong partner) -> return partner)]
472+ >>= maybe (liftIO (threadDelay 100000) >> loop) return
423473 self <- getSelfPid
424474 send partner (Ping self)
425475 putMVar serverAddr addr
@@ -433,11 +483,9 @@ testTimeout0 TestTransport{..} = do
433483 -- is not interested in, and then a single message that it wants
434484 replicateM_ 10000 $ send server "Irrelevant message"
435485 send server (Pong pid)
436− liftIO $ putMVar messagesSent ()
437− Ping _ <- expect
438− liftIO $ putMVar clientDone ()
486+ expectPing clientDone
439487
440− takeMVar clientDone
488+ verifyClient "Expected Ping from server" clientDone
441489
442490-- | Test typed channels
443491testTypedChannels :: TestTransport -> Assertion
@@ -460,10 +508,10 @@ testTypedChannels TestTransport{..} = do
460508 runProcess localNode $ do
461509 (clientSendPort, rport) <- newChan
462510 sendChan serverSendPort (clientSendPort, 5)
463− False <- receiveChan rport
464− liftIO $ putMVar clientDone ()
511+ ch <- receiveChan rport
512+ liftIO $ putMVar clientDone $ ch == False
465513
466− takeMVar clientDone
514+ verifyClient "Expected channel to send 'False'" clientDone
467515
468516-- | Test merging receive ports
469517testMergeChannels :: TestTransport -> Assertion
@@ -486,9 +534,8 @@ testMergeChannels TestTransport{..} = do
486534 rs <- mapM charChannel "abc"
487535 m <- mergePorts biased rs
488536 xs <- replicateM 9 $ receiveChan m
489− True <- return $ xs == expected
490− liftIO $ putMVar done ()
491− takeMVar done
537+ liftIO $ putMVar done $ xs == expected
538+ verifyClient "Expected single layer merge to match expected ordering" done
492539
493540 -- Two layers of merging
494541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -499,9 +546,8 @@ testMergeChannels TestTransport{..} = do
499546 ms <- mapM (mergePorts biasedInner) rss
500547 m <- mergePorts biasedOuter ms
501548 xs <- replicateM (9 * 3) $ receiveChan m
502− True <- return $ xs == expected
503− liftIO $ putMVar done ()
504− takeMVar done
549+ liftIO $ putMVar done $ xs == expected
550+ verifyClient "Expected nested channels to match expeted ordering" done
505551
506552 -- Test that if no messages are (immediately) available, the scheduler makes no difference
507553 testBlocked :: LocalNode -> Bool -> IO ()
@@ -510,43 +556,45 @@ testMergeChannels TestTransport{..} = do
510556 done <- newEmptyMVar
511557
512558 forkProcess localNode $ do
513− [sa, sb, sc] <- liftIO $ mapM readMVar vs
514− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
515− [ -- a, b, c
516− (sa, 'a')
517− , (sb, 'b')
518− , (sc, 'c')
519− -- a, c, b
520− , (sa, 'a')
521− , (sc, 'c')
522− , (sb, 'b')
523− -- b, a, c
524− , (sb, 'b')
525− , (sa, 'a')
526− , (sc, 'c')
527− -- b, c, a
528− , (sb, 'b')
529− , (sc, 'c')
530− , (sa, 'a')
531− -- c, a, b
532− , (sc, 'c')
533− , (sa, 'a')
534− , (sb, 'b')
535− -- c, b, a
536− , (sc, 'c')
537− , (sb, 'b')
538− , (sa, 'a')
539− ]
559+ ss <- liftIO $ mapM readMVar vs
560+ case ss of
561+ [sa, sb, sc] ->
562+ mapM_ ((>> pause 10000) . uncurry sendChan)
563+ [ -- a, b, c
564+ (sa, 'a')
565+ , (sb, 'b')
566+ , (sc, 'c')
567+ -- a, c, b
568+ , (sa, 'a')
569+ , (sc, 'c')
570+ , (sb, 'b')
571+ -- b, a, c
572+ , (sb, 'b')
573+ , (sa, 'a')
574+ , (sc, 'c')
575+ -- b, c, a
576+ , (sb, 'b')
577+ , (sc, 'c')
578+ , (sa, 'a')
579+ -- c, a, b
580+ , (sc, 'c')
581+ , (sa, 'a')
582+ , (sb, 'b')
583+ -- c, b, a
584+ , (sc, 'c')
585+ , (sb, 'b')
586+ , (sa, 'a')
587+ ]
588+ _ -> die "Something went horribly wrong"
540589
541590 forkProcess localNode $ do
542591 (ss, rs) <- unzip <$> replicateM 3 newChan
543592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
544593 m <- mergePorts biased rs
545594 xs <- replicateM (6 * 3) $ receiveChan m
546− True <- return $ xs == "abcacbbacbcacabcba"
547− liftIO $ putMVar done ()
595+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
548596
549− takeMVar done
597+ verifyClient "Expected merged ports to match expected ordering" done
550598
551599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
552600 mergePorts True = mergePortsBiased
@@ -562,19 +610,11 @@ testMergeChannels TestTransport{..} = do
562610testTerminate :: TestTransport -> Assertion
563611testTerminate TestTransport{..} = do
564612 localNode <- newLocalNode testTransport initRemoteTable
565− done <- newEmptyMVar
566−
567− pid <- forkProcess localNode $ do
568− liftIO $ threadDelay 100000
569− terminate
570−
571613 runProcess localNode $ do
572− ref <- monitor pid
573− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
574− True <- return $ ref == ref' && pid == pid' && ex == show ProcessTerminationException
575− liftIO $ putMVar done ()
576−
577− takeMVar done
614+ e <- try terminate :: Process (Either ProcessTerminationException ())
615+ if either show show e == show ProcessTerminationException
616+ then return ()
617+ else die "Unexpected result from terminate"
578618
579619testMonitorNode :: TestTransport -> Assertion
580620testMonitorNode TestTransport{..} = do
@@ -585,11 +625,12 @@ testMonitorNode TestTransport{..} = do
585625
586626 runProcess node2 $ do
587627 ref <- monitorNode (localNodeId node1)
588− NodeMonitorNotification ref' nid DiedDisconnect <- expect
589− True <- return $ ref == ref' && nid == localNodeId node1
590− liftIO $ putMVar done ()
628+ receiveWait [
629+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630+ return $ ref == ref' && nid == localNodeId node1)
631+ ] >>= liftIO . putMVar done
591632
592− takeMVar done
633+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
593634
594635testMonitorLiveNode :: TestTransport -> Assertion
595636testMonitorLiveNode TestTransport{..} = do
@@ -604,15 +645,16 @@ testMonitorLiveNode TestTransport{..} = do
604645 liftIO $ putMVar ready ()
605646 liftIO $ takeMVar readyr
606647 send p ()
607− NodeMonitorNotification ref' nid _ <- expect
608− True <- return $ ref == ref' && nid == localNodeId node1
609− liftIO $ putMVar done ()
648+ receiveWait [
649+ match (\(NodeMonitorNotification ref' nid _) ->
650+ (return $ ref == ref' && nid == localNodeId node1))
651+ ] >>= liftIO . putMVar done
610652
611653 takeMVar ready
612654 closeLocalNode node1
613655 putMVar readyr ()
614656
615− takeMVar done
657+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
616658
617659testMonitorChannel :: TestTransport -> Assertion
618660testMonitorChannel TestTransport{..} = do
@@ -622,18 +664,20 @@ testMonitorChannel TestTransport{..} = do
622664 pid <- forkProcess node1 $ do
623665 sport <- expect :: Process (SendPort ())
624666 ref <- monitorPort sport
625− PortMonitorNotification ref' port' reason <- expect
626− -- reason might be DiedUnknownId if the receive port is GCed before the
627− -- monitor is established (TODO: not sure that this is reasonable)
628− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
629− 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
630674
631675 runProcess node2 $ do
632676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
633677 send pid sport
634678 liftIO $ threadDelay 100000
635679
636− takeMVar gotNotification
680+ verifyClient "Expected PortMonitorNotification" gotNotification
637681
638682testRegistry :: TestTransport -> Assertion
639683testRegistry TestTransport{..} = do
@@ -645,20 +689,28 @@ testRegistry TestTransport{..} = do
645689
646690 runProcess node $ do
647691 register "ping" pingServer
648− Just pid <- whereis "ping"
649− True <- return $ pingServer == pid
692+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
650693 us <- getSelfPid
651694 nsend "ping" (Pong us)
652− Ping pid' <- expect
653− True <- return $ pingServer == pid'
654− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
655− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
656− True <- return $ x == pingServer
657− 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
658701 liftIO $ putMVar done ()
659702
660703 takeMVar done
661704
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+
662714testRegistryRemoteProcess :: TestTransport -> Assertion
663715testRegistryRemoteProcess TestTransport{..} = do
664716 node1 <- newLocalNode testTransport initRemoteTable
@@ -669,13 +721,13 @@ testRegistryRemoteProcess TestTransport{..} = do
669721
670722 runProcess node2 $ do
671723 register "ping" pingServer
672− Just pid <- whereis "ping"
673− True <- return $ pingServer == pid
724+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
674725 us <- getSelfPid
675726 nsend "ping" (Pong us)
676− Ping pid' <- expect
677− True <- return $ pingServer == pid'
678− liftIO $ putMVar done ()
727+ receiveWait [
728+ matchIf (\(Ping pid') -> pingServer == pid')
729+ (const $ liftIO $ putMVar done ())
730+ ]
679731
680732 takeMVar done
681733
@@ -683,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
683735testRemoteRegistry TestTransport{..} = do
684736 node1 <- newLocalNode testTransport initRemoteTable
685737 node2 <- newLocalNode testTransport initRemoteTable
686− done <- newEmptyMVar
687738
688739 pingServer <- forkProcess node1 ping
689740 deadProcess <- forkProcess node1 (return ())
@@ -696,32 +747,34 @@ testRemoteRegistry TestTransport{..} = do
696747 "ping" == label' && pid == pingServer)
697748 (\(RegisterReply _ _ _) -> return ()) ]
698749
699− Just pid <- whereisRemote nid1 "ping"
700− True <- return $ pingServer == pid
750+ pid <- verifyWhereIsRemote nid1 "ping"
751+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752+
701753 us <- getSelfPid
702754 nsendRemote nid1 "ping" (Pong us)
703− Ping pid' <- expect
704− True <- return $ pingServer == pid'
755+ receiveWait [
756+ match (\(Ping pid') -> return $ pingServer == pid')
757+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
705758
706759 -- test that if process was not registered Nothing is returned
707760 -- in owner field.
708761 registerRemoteAsync nid1 "dead" deadProcess
709− receiveWait [
710− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
711− (\(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+
712766 registerRemoteAsync nid1 "ping" deadProcess
713767 receiveWait [
714− matchIf (\(RegisterReply label' False (Just pid)) ->
715− "ping" == label' && pid == pingServer)
716− (\(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+
717773 unregisterRemoteAsync nid1 "dead"
718774 receiveWait [
719− matchIf (\(RegisterReply label' False Nothing) ->
720− "dead" == label' && pid == pingServer)
721− (\(RegisterReply _ _ _) -> return ()) ]
722− liftIO $ putMVar done ()
723−
724− 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"
725778
726779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
727780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -737,15 +790,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
737790 receiveWait [
738791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
739792 (\(RegisterReply _ _ _) -> return ()) ]
740− Just pid <- whereisRemote nid1 "ping"
741− True <- return $ pingServer == pid
793+ pid <- verifyWhereIsRemote nid1 "ping"
794+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
742795 us <- getSelfPid
743796 nsendRemote nid1 "ping" (Pong us)
744− Ping pid' <- expect
745− True <- return $ pingServer == pid'
746− liftIO $ putMVar done ()
797+ receiveWait [
798+ match (\(Ping pid') -> return $ pingServer == pid')
799+ ] >>= liftIO . putMVar done
747800
748− takeMVar done
801+ verifyClient "Expected Ping with ping server's ProcessId" done
749802
750803testSpawnLocal :: TestTransport -> Assertion
751804testSpawnLocal TestTransport{..} = do
@@ -759,15 +812,14 @@ testSpawnLocal TestTransport{..} = do
759812 sport <- expect
760813 sendChan sport (1234 :: Int)
761814
762− sport <- spawnChannelLocal $ \rport -> do
763− (1234 :: Int) <- receiveChan rport
764− send us ()
815+ sport <- spawnChannelLocal $
816+ \rport -> (receiveChan rport :: Process Int) >>= send us
765817
766818 send pid sport
767− () <- expect
768− liftIO $ putMVar done ()
819+ expect >>= liftIO . putMVar done
769820
770− takeMVar done
821+ res <- takeMVar done
822+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
771823
772824testSpawnAsyncStrictness :: TestTransport -> Assertion
773825testSpawnAsyncStrictness TestTransport{..} = do
@@ -796,8 +848,9 @@ testReconnect TestTransport{..} = do
796848 liftIO $ putMVar processA us
797849 msg1 <- expect
798850 msg2 <- expect
799− True <- return $ msg1 == "message 1" && msg2 == "message 3"
800− liftIO $ putMVar sendTestOk ()
851+ liftIO $ do
852+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853+ putMVar sendTestOk ()
801854
802855 forkProcess node2 $ do
803856 {-
@@ -830,7 +883,7 @@ testReconnect TestTransport{..} = do
830883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
831884 (\(RegisterReply _ _ _) -> return ()) ]
832885
833− Just _ <- whereisRemote nid1 "a"
886+ _ <- whereisRemote nid1 "a"
834887
835888
836889 -- Simulate network failure
@@ -849,9 +902,10 @@ testReconnect TestTransport{..} = do
849902 (\(RegisterReply _ _ _) -> return ()) ]
850903
851904 -- Check
852− Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
853− Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
854− 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"
855909
856910 liftIO $ putMVar registerTestOk ()
857911
@@ -892,19 +946,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
892946 isSorted _ = True
893947 -- The list can't be null since there are no failures after sending
894948 -- the last message.
895− True <- return $ isSorted msgs && not (null msgs)
896− liftIO $ putMVar usendTestOk ()
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
897950
898951 forkProcess node2 $ do
899952 them <- liftIO $ readMVar processA
900953 getSelfPid >>= send them
901− () <- expect
954+ expect :: Process ()
902955 forM_ [1..numMessages] $ \i -> do
903956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
904957 usendPrim them i
905958 liftIO (threadDelay 30000)
906959
907− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
908962
909963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
910964-- in between
@@ -930,14 +984,17 @@ testMatchAny TestTransport{..} = do
930984 runProcess localNode $ do
931985 pid <- getSelfPid
932986 send mathServer (Add pid 1 2)
933− 3 <- expect :: Process Double
987+ three <- expect :: Process Double
934988 send mathServer (Divide pid 8 2)
935− 4 <- expect :: Process Double
989+ four <- expect :: Process Double
936990 send mathServer (Divide pid 8 0)
937− DivByZero <- expect
938− liftIO $ putMVar clientDone ()
991+ divByZ <- expect
992+ liftIO $ putMVar clientDone (three, four, divByZ)
939993
940− takeMVar clientDone
994+ res <- takeMVar clientDone
995+ case res of
996+ (3, 4, DivByZero) -> return ()
997+ _ -> error "Unexpected result"
941998
942999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
9431000-- in between, however we block 'Divide' requests ....
@@ -964,12 +1021,13 @@ testMatchAnyHandle TestTransport{..} = do
9641021 runProcess localNode $ do
9651022 pid <- getSelfPid
9661023 send mathServer (Add pid 1 2)
967− 3 <- expect :: Process Double
1024+ three <- expect :: Process Double
9681025 send mathServer (Divide pid 8 2)
969− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
970− 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
9711030
972− takeMVar clientDone
9731031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
9741032 maybeForward s msg =
9751033 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -997,8 +1055,10 @@ testMatchAnyNoHandle TestTransport{..} = do
9971055 Just _ -> die "NONSENSE")
9981056 ]
9991057 -- we *must* have removed the message from our mailbox though!!!
1000− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1001− liftIO $ putMVar serverDone ()
1058+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1059+ liftIO $ do
1060+ assertBool "Expected timeout!" $ res == Nothing
1061+ putMVar serverDone ()
10021062 putMVar addr server
10031063
10041064 -- Client
@@ -1041,14 +1101,21 @@ testMatchAnyIf TestTransport{..} = do
10411101 runProcess localNode $ do
10421102 pid <- getSelfPid
10431103 send server (pid, "foo")
1044− "foo" <- expect
1045− send server (pid, "baz")
1046− "baz" <- expect
1104+ foo <- expect
1105+ -- provoking what would be the wrong ordering is informative here...
1106+
10471107 send server (pid, "bar")
1048− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1049− 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'
10501118
1051− takeMVar clientDone
10521119 where tryHandleMessage :: Message -> Process (Maybe ())
10531120 tryHandleMessage msg =
10541121 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1081,17 +1148,19 @@ testMatchMessageWithUnwrap TestTransport{..} = do
10811148 runProcess localNode $ do
10821149 pid <- getSelfPid
10831150 send server (pid, wrapMessage ("foo" :: String))
1084− "foo" <- expect
1151+ foo <- expect
10851152 send server (pid, wrapMessage ("baz" :: String))
1086− "baz" <- expect
1087− liftIO $ putMVar clientDone ()
1153+ baz <- expect
1154+ liftIO $ putMVar clientDone (foo, baz)
10881155
1089− takeMVar clientDone
1156+ res <- takeMVar clientDone
1157+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
10901158
10911159-- Test 'receiveChanTimeout'
10921160testReceiveChanTimeout :: TestTransport -> Assertion
10931161testReceiveChanTimeout TestTransport{..} = do
10941162 done <- newEmptyMVar
1163+ mvSender <- newEmptyMVar
10951164 sendPort <- newEmptyMVar
10961165
10971166 forkTry $ do
@@ -1101,18 +1170,32 @@ testReceiveChanTimeout TestTransport{..} = do
11011170 (sp, rp) <- newChan :: Process (SendPort Bool, ReceivePort Bool)
11021171 liftIO $ putMVar sendPort sp
11031172
1104− -- Wait for a message with a delay. No message arrives, we should get Nothing after 1 second
1105− Nothing <- receiveChanTimeout 1000000 rp
1173+ -- Wait for a message with a delay. No message arrives, we should get
1174+ -- Nothing after the delay.
1175+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1176+
1177+ -- Let the sender know that it can send a message.
1178+ liftIO $ putMVar mvSender ()
11061179
1107− -- Wait for a message with a delay again. Now a message arrives after 0.5 seconds
1108− Just True <- receiveChanTimeout 1000000 rp
1180+ -- Wait for a message with a delay again. Now a message arrives after
1181+ -- 0.1 seconds
1182+ res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1183+ liftIO $ assertBool "Expected result to be 'True'" res
11091184
1110− -- Wait for a message with zero timeout: non-blocking check. No message is available, we get Nothing
1111− Nothing <- receiveChanTimeout 0 rp
1185+ -- Wait for a message with zero timeout: non-blocking check. No message is
1186+ -- available, we get Nothing
1187+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1188+
1189+ -- Let the sender know that it can send a message.
1190+ liftIO $ putMVar mvSender ()
11121191
11131192 -- Again, but now there is a message available
1114− liftIO $ threadDelay 1000000
1115− Just False <- receiveChanTimeout 0 rp
1193+ fix $ \loop -> do
1194+ liftIO $ threadDelay 100000
1195+ mb <- receiveChanTimeout 0 rp
1196+ case mb of
1197+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1198+ _ -> loop
11161199
11171200 liftIO $ putMVar done ()
11181201
@@ -1121,10 +1204,11 @@ testReceiveChanTimeout TestTransport{..} = do
11211204 runProcess localNode $ do
11221205 sp <- liftIO $ readMVar sendPort
11231206
1124− liftIO $ threadDelay 1500000
1207+ liftIO $ takeMVar mvSender
1208+ liftIO $ threadDelay 100000
11251209 sendChan sp True
11261210
1127− liftIO $ threadDelay 500000
1211+ liftIO $ takeMVar mvSender
11281212 sendChan sp False
11291213
11301214 takeMVar done
@@ -1147,8 +1231,8 @@ testReceiveChanFeatures TestTransport{..} = do
11471231
11481232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
11491233
1150− True <- receiveChan rp1
1151− False <- receiveChan rp1
1234+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
11521236
11531237 -- Test Applicative instance
11541238
@@ -1157,7 +1241,7 @@ testReceiveChanFeatures TestTransport{..} = do
11571241
11581242 let rp2 = pure (+) <*> rpInt <*> rpInt
11591243
1160− 7 <- receiveChan rp2
1244+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
11611245
11621246 -- Test Alternative instance
11631247
@@ -1166,8 +1250,8 @@ testReceiveChanFeatures TestTransport{..} = do
11661250
11671251 let rp3 = (even <$> rpInt) <|> rpBool
11681252
1169− False <- receiveChan rp3
1170− True <- receiveChan rp3
1253+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
11711255
11721256 -- Test Monad instance
11731257
@@ -1181,17 +1265,86 @@ testReceiveChanFeatures TestTransport{..} = do
11811265 then rpInt
11821266 else return 7
11831267
1184− 5 <- receiveChan rp4
1185− 7 <- receiveChan rp4
1268+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
11861270
11871271 liftIO $ putMVar done ()
11881272
11891273 takeMVar done
11901274
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+
11911345testKillLocal :: TestTransport -> Assertion
11921346testKillLocal TestTransport{..} = do
11931347 localNode <- newLocalNode testTransport initRemoteTable
1194− done <- newEmptyMVar
11951348
11961349 pid <- forkProcess localNode $ do
11971350 liftIO $ threadDelay 1000000
@@ -1200,17 +1353,18 @@ testKillLocal TestTransport{..} = do
12001353 ref <- monitor pid
12011354 us <- getSelfPid
12021355 kill pid "TestKill"
1203− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1204− True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1205− liftIO $ putMVar done ()
1206−
1207− 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"
12081363
12091364testKillRemote :: TestTransport -> Assertion
12101365testKillRemote TestTransport{..} = do
12111366 node1 <- newLocalNode testTransport initRemoteTable
12121367 node2 <- newLocalNode testTransport initRemoteTable
1213− done <- newEmptyMVar
12141368
12151369 pid <- forkProcess node1 $ do
12161370 liftIO $ threadDelay 1000000
@@ -1219,11 +1373,17 @@ testKillRemote TestTransport{..} = do
12191373 ref <- monitor pid
12201374 us <- getSelfPid
12211375 kill pid "TestKill"
1222− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1223− True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1224− liftIO $ putMVar done ()
1225−
1226− 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"
12271387
12281388testCatchesExit :: TestTransport -> Assertion
12291389testCatchesExit TestTransport{..} = do
@@ -1249,7 +1409,10 @@ testHandleMessageIf TestTransport{..} = do
12491409 self <- getSelfPid
12501410 send self (5 :: Integer, 10 :: Integer)
12511411 msg <- receiveWait [ matchMessage return ]
1252− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1412+ handleMessageIf msg
1413+ (\() -> True)
1414+ (\() -> die "whoops") >>= maybe (return ())
1415+ (const $ die "Expected Mismatch")
12531416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
12541417 (\input -> liftIO $ putMVar done input)
12551418 return ()
@@ -1294,8 +1457,11 @@ testDie TestTransport{..} = do
12941457 (die ("foobar", 123 :: Int))
12951458 `catchExit` \_from reason -> do
12961459 -- TODO: should verify that 'from' has the right value
1297− True <- return $ reason == ("foobar", 123 :: Int)
1460+ let res = reason == ("foobar", 123 :: Int)
12981461 liftIO $ putMVar done ()
1462+ if res
1463+ then return ()
1464+ else die "Something went horribly wrong"
12991465
13001466 takeMVar done
13011467
@@ -1309,8 +1475,11 @@ testPrettyExit TestTransport{..} = do
13091475 `catch` \ex@(ProcessExitException from _) ->
13101476 let expected = "exit-from=" ++ (show from)
13111477 in do
1312− True <- return $ (show ex) == expected
1478+ let res = (show ex) == expected
13131479 liftIO $ putMVar done ()
1480+ if res
1481+ then return ()
1482+ else die "Something went horribly wrong"
13141483
13151484 takeMVar done
13161485
@@ -1326,17 +1495,26 @@ testExitLocal TestTransport{..} = do
13261495 pid <- forkProcess localNode $ do
13271496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
13281497 -- TODO: should verify that 'from' has the right value
1329− True <- return $ reason == "TestExit"
1498+ res <- return $ reason == "TestExit"
13301499 liftIO $ putMVar supervisedDone ()
1500+ if res
1501+ then return ()
1502+ else die "Something went horribly wrong"
13311503
13321504 runProcess localNode $ do
13331505 liftIO $ takeMVar handlerSetUp
13341506 ref <- monitor pid
13351507 exit pid "TestExit"
13361508 -- This time the client catches the exception, so it dies normally
1337− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1338− True <- return $ ref == ref' && pid == pid'
1339− 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"
13401518
13411519 takeMVar supervisedDone
13421520 takeMVar supervisorDone
@@ -1352,19 +1530,98 @@ testExitRemote TestTransport{..} = do
13521530 (receiveWait [] :: Process ()) -- block forever
13531531 `catchExit` \_from reason -> do
13541532 -- TODO: should verify that 'from' has the right value
1355− True <- return $ reason == "TestExit"
1533+ res <- return $ reason == "TestExit"
13561534 liftIO $ putMVar supervisedDone ()
1535+ if res
1536+ then return ()
1537+ else die "Something went horribly wrong"
13571538
13581539 runProcess node2 $ do
13591540 ref <- monitor pid
13601541 exit pid "TestExit"
1361− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1362− True <- return $ ref == ref' && pid == pid'
1363− 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"
13641551
13651552 takeMVar supervisedDone
13661553 takeMVar supervisorDone
13671554
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+
13681625testUnsafeSend :: TestTransport -> Assertion
13691626testUnsafeSend TestTransport{..} = do
13701627 serverAddr <- newEmptyMVar
@@ -1380,8 +1637,7 @@ testUnsafeSend TestTransport{..} = do
13801637 void $ forkProcess localNode $ do
13811638 serverPid <- liftIO $ takeMVar serverAddr
13821639 getSelfPid >>= unsafeSend serverPid
1383− () <- expect
1384− liftIO $ putMVar clientDone ()
1640+ expect >>= liftIO . putMVar clientDone
13851641
13861642 takeMVar clientDone
13871643
@@ -1400,8 +1656,7 @@ testUnsafeUSend TestTransport{..} = do
14001656 void $ forkProcess localNode $ do
14011657 serverPid <- liftIO $ takeMVar serverAddr
14021658 getSelfPid >>= unsafeUSend serverPid
1403− () <- expect
1404− liftIO $ putMVar clientDone ()
1659+ expect >>= liftIO . putMVar clientDone
14051660
14061661 takeMVar clientDone
14071662
@@ -1412,8 +1667,7 @@ testUnsafeNSend TestTransport{..} = do
14121667 localNode <- newLocalNode testTransport initRemoteTable
14131668
14141669 pid <- forkProcess localNode $ do
1415− () <- expect
1416− liftIO $ putMVar clientDone ()
1670+ expect >>= liftIO . putMVar clientDone
14171671
14181672 void $ runProcess localNode $ do
14191673 register "foobar" pid
@@ -1421,6 +1675,24 @@ testUnsafeNSend TestTransport{..} = do
14211675
14221676 takeMVar clientDone
14231677
1678+testUnsafeNSendRemote :: TestTransport -> Assertion
1679+testUnsafeNSendRemote TestTransport{..} = do
1680+ clientDone <- newEmptyMVar
1681+
1682+ localNode1 <- newLocalNode testTransport initRemoteTable
1683+ localNode2 <- newLocalNode testTransport initRemoteTable
1684+
1685+ _ <- forkProcess localNode1 $ do
1686+ getSelfPid >>= register "foobar"
1687+ liftIO $ putMVar clientDone ()
1688+ expect >>= liftIO . putMVar clientDone
1689+
1690+ takeMVar clientDone
1691+ void $ runProcess localNode2 $ do
1692+ unsafeNSendRemote (localNodeId localNode1) "foobar" ()
1693+
1694+ takeMVar clientDone
1695+
14241696testUnsafeSendChan :: TestTransport -> Assertion
14251697testUnsafeSendChan TestTransport{..} = do
14261698 serverAddr <- newEmptyMVar
@@ -1437,7 +1709,7 @@ testUnsafeSendChan TestTransport{..} = do
14371709 serverPid <- liftIO $ takeMVar serverAddr
14381710 (sp, rp) <- newChan
14391711 unsafeSend serverPid sp
1440− () <- receiveChan rp
1712+ receiveChan rp :: Process ()
14411713 liftIO $ putMVar clientDone ()
14421714
14431715 takeMVar clientDone
@@ -1451,8 +1723,8 @@ testCallLocal TestTransport{..} = do
14511723 runProcess node $ do
14521724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
14531725 liftIO $ putMVar result r
1454− True <- takeMVar result
1455− return ()
1726+
1727+ takeMVar result >>= assertBool "Expected 'True'"
14561728
14571729 -- Testing that when callLocal is interrupted, the worker is interrupted.
14581730 ibox <- newIORef False
@@ -1469,10 +1741,9 @@ testCallLocal TestTransport{..} = do
14691741 (send keeper ())
14701742 caller <- expect
14711743 exit caller "test"
1472− () <- expect
1473− return ()
1474− True <- readIORef ibox
1475− return ()
1744+ expect :: Process ()
1745+
1746+ readIORef ibox >>= assertBool "Expected 'True'"
14761747
14771748 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
14781749 ibox2 <- newIORef False
@@ -1481,8 +1752,8 @@ testCallLocal TestTransport{..} = do
14811752 liftIO $ writeIORef ibox2 $ case r of
14821753 Left (ErrorCall "e") -> True
14831754 _ -> False
1484− True <- readIORef ibox
1485− return ()
1755+
1756+ readIORef ibox >>= assertBool "Expected 'True'"
14861757
14871758 -- Test that caller waits for the worker in correct situation
14881759 ibox3 <- newIORef False
@@ -1499,8 +1770,8 @@ testCallLocal TestTransport{..} = do
14991770 liftIO $ putMVar result3 =<< readIORef ibox3
15001771 worker <- expect
15011772 send worker ()
1502− True <- takeMVar result3
1503− return ()
1773+
1774+ takeMVar result3 >>= assertBool "Expected 'True'"
15041775
15051776 -- Test that caller waits for the worker in case when caller gets an exception
15061777 ibox4 <- newIORef False
@@ -1516,13 +1787,9 @@ testCallLocal TestTransport{..} = do
15161787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
15171788 caller <- expect
15181789 exit caller "hi!"
1519− True <- takeMVar result4
1520− return ()
1521− -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1522−
1523−
1524−
15251790
1791+ takeMVar result4 >>= assertBool "Expected 'True'"
1792+ -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
15261793
15271794tests :: TestTransport -> IO [Test]
15281795tests testtrans = return [
@@ -1547,6 +1814,7 @@ tests testtrans = return [
15471814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
15481815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
15491816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
15501818 , testCase "KillLocal" (testKillLocal testtrans)
15511819 , testCase "KillRemote" (testKillRemote testtrans)
15521820 , testCase "Die" (testDie testtrans)
@@ -1556,11 +1824,13 @@ tests testtrans = return [
15561824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
15571825 , testCase "ExitLocal" (testExitLocal testtrans)
15581826 , testCase "ExitRemote" (testExitRemote testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
15591828 , testCase "TextCallLocal" (testCallLocal testtrans)
15601829 -- Unsafe Primitives
15611830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
15621831 , testCase "TestUnsafeUSend" (testUnsafeUSend testtrans)
15631832 , testCase "TestUnsafeNSend" (testUnsafeNSend testtrans)
1833+ , testCase "TestUnsafeNSendRemote" (testUnsafeNSendRemote testtrans)
15641834 , testCase "TestUnsafeSendChan" (testUnsafeSendChan testtrans)
15651835 -- usend
15661836 , testCase "USend" (testUSend usend testtrans 50)
@@ -1607,17 +1877,3 @@ tests testtrans = return [
16071877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
16081878 ]
16091879 ]
1610−
1611−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1612−syncBreakConnection breakConnection nid0 nid1 = do
1613− m <- newEmptyMVar
1614− _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1615− runProcess nid0 $ do
1616− them <- liftIO $ takeMVar m
1617− pinger <- spawnLocal $ forever $ send them ()
1618− _ <- monitorNode (localNodeId nid1)
1619− liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1620− (nodeAddress $ localNodeId nid1)
1621− NodeMonitorNotification _ _ _ <- expect
1622− kill pinger "finished"
1623− return ()