@@ -25,18 +25,13 @@ import Control.Concurrent.MVar
2525 )
2626import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
2727import Control.Exception (SomeException, throwIO, ErrorCall(..))
28−import Control.Monad.Catch (try, catch, finally, mask, onException)
29−import Control.Applicative ((<|>))
28+import qualified Control.Exception as Ex (catch)
29+import Control.Applicative ((<$>), (<*>), pure, (<|>))
3030import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
31−import Control.Distributed.Process hiding
32− ( try
33− , catch
34− , finally
35− , mask
36− , onException
37− )
31+import Control.Distributed.Process
3832import Control.Distributed.Process.Internal.Types
39− ( LocalNode(localEndPoint)
33+ ( NodeId(nodeAddress)
34+ , LocalNode(localEndPoint)
4035 , ProcessExitException(..)
4136 , nullProcessId
4237 , createUnencodedMessage
@@ -44,13 +39,12 @@ import Control.Distributed.Process.Internal.Types
4439import Control.Distributed.Process.Node
4540import Control.Distributed.Process.Debug
4641import Control.Distributed.Process.Management.Internal.Types
47−import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
4842import Control.Distributed.Process.Serializable (Serializable)
49−import Data.Maybe (isNothing, isJust)
50−import Test.HUnit (Assertion, assertBool, assertFailure)
43+
44+import Test.HUnit (Assertion, assertFailure, assertBool)
5145import Test.Framework (Test, testGroup)
5246import Test.Framework.Providers.HUnit (testCase)
53−import Control.Rematch hiding (match, isNothing, isJust)
47+import Control.Rematch hiding (match)
5448import Control.Rematch.Run (Match(..))
5549
5650newtype Ping = Ping ProcessId
@@ -73,7 +67,7 @@ expectThat a matcher = case res of
7367forkTry :: IO () -> IO ThreadId
7468forkTry p = do
7569 tid <- myThreadId
76− forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
70+ forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
7771
7872-- | The ping server from the paper
7973ping :: Process ()
@@ -83,46 +77,12 @@ ping = do
8377 send partner (Ping self)
8478 ping
8579
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−
9480-- | Quick and dirty synchronous version of whereisRemoteAsync
9581whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
9682whereisRemote nid string = do
9783 whereisRemoteAsync nid string
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 ()
84+ WhereIsReply _ mPid <- expect
85+ return mPid
12686
12787data Add = Add ProcessId Double Double deriving (Typeable)
12888data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -197,18 +157,12 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
197157 unmonitor ref
198158 liftIO $ putMVar done ()
199159 (False, ref) -> do
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− ]
160+ ProcessMonitorNotification ref' pid reason' <- expect
161+ True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
162+ liftIO $ putMVar done ()
208163 )
209164 (\(ProcessLinkException pid reason') -> do
210− (liftIO $ assertBool "link exception unmatched" $
211− pid == theirAddr && not mOrL && not un && reason == reason')
165+ True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
212166 liftIO $ putMVar done ()
213167 )
214168
@@ -239,10 +193,8 @@ testPing TestTransport{..} = do
239193 pid <- getSelfPid
240194 replicateM_ numPings $ do
241195 send pingServer (Pong pid)
242− p <- expectTimeout 3000000
243− case p of
244− Just (Ping _) -> return ()
245− Nothing -> die "Failed to receive Ping"
196+ Ping _ <- expect
197+ return ()
246198
247199 putMVar clientDone ()
248200
@@ -329,7 +281,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
329281 runProcess localNode $ do
330282 monitor theirAddr
331283 -- wait for the process to die
332− expect :: Process ProcessMonitorNotification
284+ ProcessMonitorNotification _ _ _ <- expect
333285 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
334286
335287 takeMVar done
@@ -403,17 +355,14 @@ testMath TestTransport{..} = do
403355 runProcess localNode $ do
404356 pid <- getSelfPid
405357 send mathServer (Add pid 1 2)
406− three <- expect :: Process Double
358+ 3 <- expect :: Process Double
407359 send mathServer (Divide pid 8 2)
408− four <- expect :: Process Double
360+ 4 <- expect :: Process Double
409361 send mathServer (Divide pid 8 0)
410− divByZ <- expect
411− liftIO $ putMVar clientDone (three, four, divByZ)
362+ DivByZero <- expect
363+ liftIO $ putMVar clientDone ()
412364
413− res <- takeMVar clientDone
414− case res of
415− (3, 4, DivByZero) -> return ()
416− _ -> error $ "Something went horribly wrong"
365+ takeMVar clientDone
417366
418367-- | Send first message (i.e. connect) to an already terminated process
419368-- (without monitoring); then send another message to a second process on
@@ -441,9 +390,11 @@ testSendToTerminated TestTransport{..} = do
441390 pid <- getSelfPid
442391 send server1 "Hi"
443392 send server2 (Pong pid)
444− expectPing clientDone
393+ Ping pid' <- expect
394+ True <- return $ pid' == server2
395+ liftIO $ putMVar clientDone ()
445396
446− verifyClient "Expected Ping from server" clientDone
397+ takeMVar clientDone
447398
448399-- | Test (non-zero) timeout
449400testTimeout :: TestTransport -> Assertion
@@ -452,10 +403,10 @@ testTimeout TestTransport{..} = do
452403 done <- newEmptyMVar
453404
454405 runProcess localNode $ do
455− res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456− liftIO $ putMVar done $ res == Nothing
406+ Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
407+ liftIO $ putMVar done ()
457408
458− verifyClient "Expected receiveTimeout to timeout..." done
409+ takeMVar done
459410
460411-- | Test zero timeout
461412testTimeout0 :: TestTransport -> Assertion
@@ -483,9 +434,10 @@ testTimeout0 TestTransport{..} = do
483434 -- is not interested in, and then a single message that it wants
484435 replicateM_ 10000 $ send server "Irrelevant message"
485436 send server (Pong pid)
486− expectPing clientDone
437+ Ping _ <- expect
438+ liftIO $ putMVar clientDone ()
487439
488− verifyClient "Expected Ping from server" clientDone
440+ takeMVar clientDone
489441
490442-- | Test typed channels
491443testTypedChannels :: TestTransport -> Assertion
@@ -508,10 +460,10 @@ testTypedChannels TestTransport{..} = do
508460 runProcess localNode $ do
509461 (clientSendPort, rport) <- newChan
510462 sendChan serverSendPort (clientSendPort, 5)
511− ch <- receiveChan rport
512− liftIO $ putMVar clientDone $ ch == False
463+ False <- receiveChan rport
464+ liftIO $ putMVar clientDone ()
513465
514− verifyClient "Expected channel to send 'False'" clientDone
466+ takeMVar clientDone
515467
516468-- | Test merging receive ports
517469testMergeChannels :: TestTransport -> Assertion
@@ -534,8 +486,9 @@ testMergeChannels TestTransport{..} = do
534486 rs <- mapM charChannel "abc"
535487 m <- mergePorts biased rs
536488 xs <- replicateM 9 $ receiveChan m
537− liftIO $ putMVar done $ xs == expected
538− verifyClient "Expected single layer merge to match expected ordering" done
489+ True <- return $ xs == expected
490+ liftIO $ putMVar done ()
491+ takeMVar done
539492
540493 -- Two layers of merging
541494 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -546,8 +499,9 @@ testMergeChannels TestTransport{..} = do
546499 ms <- mapM (mergePorts biasedInner) rss
547500 m <- mergePorts biasedOuter ms
548501 xs <- replicateM (9 * 3) $ receiveChan m
549− liftIO $ putMVar done $ xs == expected
550− verifyClient "Expected nested channels to match expeted ordering" done
502+ True <- return $ xs == expected
503+ liftIO $ putMVar done ()
504+ takeMVar done
551505
552506 -- Test that if no messages are (immediately) available, the scheduler makes no difference
553507 testBlocked :: LocalNode -> Bool -> IO ()
@@ -556,45 +510,43 @@ testMergeChannels TestTransport{..} = do
556510 done <- newEmptyMVar
557511
558512 forkProcess localNode $ do
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"
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+ ]
589540
590541 forkProcess localNode $ do
591542 (ss, rs) <- unzip <$> replicateM 3 newChan
592543 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
593544 m <- mergePorts biased rs
594545 xs <- replicateM (6 * 3) $ receiveChan m
595− liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
546+ True <- return $ xs == "abcacbbacbcacabcba"
547+ liftIO $ putMVar done ()
596548
597− verifyClient "Expected merged ports to match expected ordering" done
549+ takeMVar done
598550
599551 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
600552 mergePorts True = mergePortsBiased
@@ -612,9 +564,8 @@ testTerminate TestTransport{..} = do
612564 localNode <- newLocalNode testTransport initRemoteTable
613565 runProcess localNode $ do
614566 e <- try terminate :: Process (Either ProcessTerminationException ())
615− if either show show e == show ProcessTerminationException
616− then return ()
617− else die "Unexpected result from terminate"
567+ True <- return $ either show show e == show ProcessTerminationException
568+ return ()
618569
619570testMonitorNode :: TestTransport -> Assertion
620571testMonitorNode TestTransport{..} = do
@@ -625,12 +576,11 @@ testMonitorNode TestTransport{..} = do
625576
626577 runProcess node2 $ do
627578 ref <- monitorNode (localNodeId node1)
628− receiveWait [
629− match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630− return $ ref == ref' && nid == localNodeId node1)
631− ] >>= liftIO . putMVar done
579+ NodeMonitorNotification ref' nid DiedDisconnect <- expect
580+ True <- return $ ref == ref' && nid == localNodeId node1
581+ liftIO $ putMVar done ()
632582
633− verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
583+ takeMVar done
634584
635585testMonitorLiveNode :: TestTransport -> Assertion
636586testMonitorLiveNode TestTransport{..} = do
@@ -645,16 +595,15 @@ testMonitorLiveNode TestTransport{..} = do
645595 liftIO $ putMVar ready ()
646596 liftIO $ takeMVar readyr
647597 send p ()
648− receiveWait [
649− match (\(NodeMonitorNotification ref' nid _) ->
650− (return $ ref == ref' && nid == localNodeId node1))
651− ] >>= liftIO . putMVar done
598+ NodeMonitorNotification ref' nid _ <- expect
599+ True <- return $ ref == ref' && nid == localNodeId node1
600+ liftIO $ putMVar done ()
652601
653602 takeMVar ready
654603 closeLocalNode node1
655604 putMVar readyr ()
656605
657− verifyClient "Expected NodeMonitorNotification for LIVE node" done
606+ takeMVar done
658607
659608testMonitorChannel :: TestTransport -> Assertion
660609testMonitorChannel TestTransport{..} = do
@@ -664,20 +613,18 @@ testMonitorChannel TestTransport{..} = do
664613 pid <- forkProcess node1 $ do
665614 sport <- expect :: Process (SendPort ())
666615 ref <- monitorPort sport
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
616+ PortMonitorNotification ref' port' reason <- expect
617+ -- reason might be DiedUnknownId if the receive port is GCed before the
618+ -- monitor is established (TODO: not sure that this is reasonable)
619+ return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
620+ liftIO $ putMVar gotNotification ()
674621
675622 runProcess node2 $ do
676623 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
677624 send pid sport
678625 liftIO $ threadDelay 100000
679626
680− verifyClient "Expected PortMonitorNotification" gotNotification
627+ takeMVar gotNotification
681628
682629testRegistry :: TestTransport -> Assertion
683630testRegistry TestTransport{..} = do
@@ -689,28 +636,20 @@ testRegistry TestTransport{..} = do
689636
690637 runProcess node $ do
691638 register "ping" pingServer
692− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
639+ Just pid <- whereis "ping"
640+ True <- return $ pingServer == pid
693641 us <- getSelfPid
694642 nsend "ping" (Pong us)
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
643+ Ping pid' <- expect
644+ True <- return $ pingServer == pid'
645+ Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
646+ Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
647+ True <- return $ x == pingServer
648+ Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
701649 liftIO $ putMVar done ()
702650
703651 takeMVar done
704652
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−
714653testRegistryRemoteProcess :: TestTransport -> Assertion
715654testRegistryRemoteProcess TestTransport{..} = do
716655 node1 <- newLocalNode testTransport initRemoteTable
@@ -721,13 +660,13 @@ testRegistryRemoteProcess TestTransport{..} = do
721660
722661 runProcess node2 $ do
723662 register "ping" pingServer
724− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
663+ Just pid <- whereis "ping"
664+ True <- return $ pingServer == pid
725665 us <- getSelfPid
726666 nsend "ping" (Pong us)
727− receiveWait [
728− matchIf (\(Ping pid') -> pingServer == pid')
729− (const $ liftIO $ putMVar done ())
730− ]
667+ Ping pid' <- expect
668+ True <- return $ pingServer == pid'
669+ liftIO $ putMVar done ()
731670
732671 takeMVar done
733672
@@ -735,6 +674,7 @@ testRemoteRegistry :: TestTransport -> Assertion
735674testRemoteRegistry TestTransport{..} = do
736675 node1 <- newLocalNode testTransport initRemoteTable
737676 node2 <- newLocalNode testTransport initRemoteTable
677+ done <- newEmptyMVar
738678
739679 pingServer <- forkProcess node1 ping
740680 deadProcess <- forkProcess node1 (return ())
@@ -747,34 +687,32 @@ testRemoteRegistry TestTransport{..} = do
747687 "ping" == label' && pid == pingServer)
748688 (\(RegisterReply _ _ _) -> return ()) ]
749689
750− pid <- verifyWhereIsRemote nid1 "ping"
751− liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752−
690+ Just pid <- whereisRemote nid1 "ping"
691+ True <- return $ pingServer == pid
753692 us <- getSelfPid
754693 nsendRemote nid1 "ping" (Pong us)
755− receiveWait [
756− match (\(Ping pid') -> return $ pingServer == pid')
757− ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
694+ Ping pid' <- expect
695+ True <- return $ pingServer == pid'
758696
759697 -- test that if process was not registered Nothing is returned
760698 -- in owner field.
761699 registerRemoteAsync nid1 "dead" deadProcess
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−
700+ receiveWait [
701+ matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
702+ (\(RegisterReply _ _ _) -> return ()) ]
766703 registerRemoteAsync nid1 "ping" deadProcess
767704 receiveWait [
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−
705+ matchIf (\(RegisterReply label' False (Just pid)) ->
706+ "ping" == label' && pid == pingServer)
707+ (\(RegisterReply _ _ _) -> return ()) ]
773708 unregisterRemoteAsync nid1 "dead"
774709 receiveWait [
775− matchIf (\(RegisterReply label' _ _) -> "dead" == label')
776− (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
777− ] >>= liftIO . assertBool "Expected False and Nothing in RegisterReply"
710+ matchIf (\(RegisterReply label' False Nothing) ->
711+ "dead" == label' && pid == pingServer)
712+ (\(RegisterReply _ _ _) -> return ()) ]
713+ liftIO $ putMVar done ()
714+
715+ takeMVar done
778716
779717testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
780718testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -790,15 +728,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
790728 receiveWait [
791729 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
792730 (\(RegisterReply _ _ _) -> return ()) ]
793− pid <- verifyWhereIsRemote nid1 "ping"
794− liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
731+ Just pid <- whereisRemote nid1 "ping"
732+ True <- return $ pingServer == pid
795733 us <- getSelfPid
796734 nsendRemote nid1 "ping" (Pong us)
797− receiveWait [
798− match (\(Ping pid') -> return $ pingServer == pid')
799− ] >>= liftIO . putMVar done
735+ Ping pid' <- expect
736+ True <- return $ pingServer == pid'
737+ liftIO $ putMVar done ()
800738
801− verifyClient "Expected Ping with ping server's ProcessId" done
739+ takeMVar done
802740
803741testSpawnLocal :: TestTransport -> Assertion
804742testSpawnLocal TestTransport{..} = do
@@ -812,14 +750,15 @@ testSpawnLocal TestTransport{..} = do
812750 sport <- expect
813751 sendChan sport (1234 :: Int)
814752
815− sport <- spawnChannelLocal $
816− \rport -> (receiveChan rport :: Process Int) >>= send us
753+ sport <- spawnChannelLocal $ \rport -> do
754+ (1234 :: Int) <- receiveChan rport
755+ send us ()
817756
818757 send pid sport
819− expect >>= liftIO . putMVar done
758+ () <- expect
759+ liftIO $ putMVar done ()
820760
821− res <- takeMVar done
822− assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
761+ takeMVar done
823762
824763testSpawnAsyncStrictness :: TestTransport -> Assertion
825764testSpawnAsyncStrictness TestTransport{..} = do
@@ -848,9 +787,8 @@ testReconnect TestTransport{..} = do
848787 liftIO $ putMVar processA us
849788 msg1 <- expect
850789 msg2 <- expect
851− liftIO $ do
852− assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853− putMVar sendTestOk ()
790+ True <- return $ msg1 == "message 1" && msg2 == "message 3"
791+ liftIO $ putMVar sendTestOk ()
854792
855793 forkProcess node2 $ do
856794 {-
@@ -883,7 +821,7 @@ testReconnect TestTransport{..} = do
883821 matchIf (\(RegisterReply label' _ _) -> "a" == label')
884822 (\(RegisterReply _ _ _) -> return ()) ]
885823
886− _ <- whereisRemote nid1 "a"
824+ Just _ <- whereisRemote nid1 "a"
887825
888826
889827 -- Simulate network failure
@@ -902,10 +840,9 @@ testReconnect TestTransport{..} = do
902840 (\(RegisterReply _ _ _) -> return ()) ]
903841
904842 -- Check
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"
843+ Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
844+ Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
845+ Just _ <- whereisRemote nid1 "c"
909846
910847 liftIO $ putMVar registerTestOk ()
911848
@@ -946,19 +883,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
946883 isSorted _ = True
947884 -- The list can't be null since there are no failures after sending
948885 -- the last message.
949− liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
886+ True <- return $ isSorted msgs && not (null msgs)
887+ liftIO $ putMVar usendTestOk ()
950888
951889 forkProcess node2 $ do
952890 them <- liftIO $ readMVar processA
953891 getSelfPid >>= send them
954− expect :: Process ()
892+ () <- expect
955893 forM_ [1..numMessages] $ \i -> do
956894 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
957895 usendPrim them i
958896 liftIO (threadDelay 30000)
959897
960− res <- takeMVar usendTestOk
961− assertBool "Unexpected failure after sending last msg" res
898+ takeMVar usendTestOk
962899
963900-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
964901-- in between
@@ -984,17 +921,14 @@ testMatchAny TestTransport{..} = do
984921 runProcess localNode $ do
985922 pid <- getSelfPid
986923 send mathServer (Add pid 1 2)
987− three <- expect :: Process Double
924+ 3 <- expect :: Process Double
988925 send mathServer (Divide pid 8 2)
989− four <- expect :: Process Double
926+ 4 <- expect :: Process Double
990927 send mathServer (Divide pid 8 0)
991− divByZ <- expect
992− liftIO $ putMVar clientDone (three, four, divByZ)
928+ DivByZero <- expect
929+ liftIO $ putMVar clientDone ()
993930
994− res <- takeMVar clientDone
995− case res of
996− (3, 4, DivByZero) -> return ()
997− _ -> error "Unexpected result"
931+ takeMVar clientDone
998932
999933-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
1000934-- in between, however we block 'Divide' requests ....
@@ -1021,13 +955,12 @@ testMatchAnyHandle TestTransport{..} = do
1021955 runProcess localNode $ do
1022956 pid <- getSelfPid
1023957 send mathServer (Add pid 1 2)
1024− three <- expect :: Process Double
958+ 3 <- expect :: Process Double
1025959 send mathServer (Divide pid 8 2)
1026− res <- (expectTimeout 100000) :: Process (Maybe Double)
1027− liftIO $ putMVar clientDone $ three == 3 && res == Nothing
1028−
1029− verifyClient "Expected Nothing (i.e. timeout)" clientDone
960+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
961+ liftIO $ putMVar clientDone ()
1030962
963+ takeMVar clientDone
1031964 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1032965 maybeForward s msg =
1033966 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -1055,10 +988,8 @@ testMatchAnyNoHandle TestTransport{..} = do
1055988 Just _ -> die "NONSENSE")
1056989 ]
1057990 -- we *must* have removed the message from our mailbox though!!!
1058− res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1059− liftIO $ do
1060− assertBool "Expected timeout!" $ res == Nothing
1061− putMVar serverDone ()
991+ Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
992+ liftIO $ putMVar serverDone ()
1062993 putMVar addr server
1063994
1064995 -- Client
@@ -1101,21 +1032,14 @@ testMatchAnyIf TestTransport{..} = do
11011032 runProcess localNode $ do
11021033 pid <- getSelfPid
11031034 send server (pid, "foo")
1104− foo <- expect
1105− -- provoking what would be the wrong ordering is informative here...
1106−
1107− send server (pid, "bar")
1108− bar <- (expectTimeout 100000) :: Process (Maybe String) -- was Double o_O !?
1109−
1035+ "foo" <- expect
11101036 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'
1037+ "baz" <- expect
1038+ send server (pid, "bar")
1039+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1040+ liftIO $ putMVar clientDone ()
11181041
1042+ takeMVar clientDone
11191043 where tryHandleMessage :: Message -> Process (Maybe ())
11201044 tryHandleMessage msg =
11211045 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1148,13 +1072,12 @@ testMatchMessageWithUnwrap TestTransport{..} = do
11481072 runProcess localNode $ do
11491073 pid <- getSelfPid
11501074 send server (pid, wrapMessage ("foo" :: String))
1151− foo <- expect
1075+ "foo" <- expect
11521076 send server (pid, wrapMessage ("baz" :: String))
1153− baz <- expect
1154− liftIO $ putMVar clientDone (foo, baz)
1077+ "baz" <- expect
1078+ liftIO $ putMVar clientDone ()
11551079
1156− res <- takeMVar clientDone
1157− assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1080+ takeMVar clientDone
11581081
11591082-- Test 'receiveChanTimeout'
11601083testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1172,19 +1095,18 @@ testReceiveChanTimeout TestTransport{..} = do
11721095
11731096 -- Wait for a message with a delay. No message arrives, we should get
11741097 -- Nothing after the delay.
1175− receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1098+ Nothing <- receiveChanTimeout 100000 rp
11761099
11771100 -- Let the sender know that it can send a message.
11781101 liftIO $ putMVar mvSender ()
11791102
11801103 -- Wait for a message with a delay again. Now a message arrives after
11811104 -- 0.1 seconds
1182− res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1183− liftIO $ assertBool "Expected result to be 'True'" res
1105+ Just True <- receiveChanTimeout 20000000 rp
11841106
11851107 -- Wait for a message with zero timeout: non-blocking check. No message is
11861108 -- available, we get Nothing
1187− receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1109+ Nothing <- receiveChanTimeout 0 rp
11881110
11891111 -- Let the sender know that it can send a message.
11901112 liftIO $ putMVar mvSender ()
@@ -1194,7 +1116,7 @@ testReceiveChanTimeout TestTransport{..} = do
11941116 liftIO $ threadDelay 100000
11951117 mb <- receiveChanTimeout 0 rp
11961118 case mb of
1197− Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1119+ Just b -> do False <- return b; return ()
11981120 _ -> loop
11991121
12001122 liftIO $ putMVar done ()
@@ -1231,8 +1153,8 @@ testReceiveChanFeatures TestTransport{..} = do
12311153
12321154 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
12331155
1234− receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235− receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1156+ True <- receiveChan rp1
1157+ False <- receiveChan rp1
12361158
12371159 -- Test Applicative instance
12381160
@@ -1241,7 +1163,7 @@ testReceiveChanFeatures TestTransport{..} = do
12411163
12421164 let rp2 = pure (+) <*> rpInt <*> rpInt
12431165
1244− receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1166+ 7 <- receiveChan rp2
12451167
12461168 -- Test Alternative instance
12471169
@@ -1250,8 +1172,8 @@ testReceiveChanFeatures TestTransport{..} = do
12501172
12511173 let rp3 = (even <$> rpInt) <|> rpBool
12521174
1253− receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254− receiveChan rp3 >>= liftIO . assertBool "Expected True"
1175+ False <- receiveChan rp3
1176+ True <- receiveChan rp3
12551177
12561178 -- Test Monad instance
12571179
@@ -1265,86 +1187,17 @@ testReceiveChanFeatures TestTransport{..} = do
12651187 then rpInt
12661188 else return 7
12671189
1268− receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269− receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1190+ 5 <- receiveChan rp4
1191+ 7 <- receiveChan rp4
12701192
12711193 liftIO $ putMVar done ()
12721194
12731195 takeMVar done
12741196
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−
13451197testKillLocal :: TestTransport -> Assertion
13461198testKillLocal TestTransport{..} = do
13471199 localNode <- newLocalNode testTransport initRemoteTable
1200+ done <- newEmptyMVar
13481201
13491202 pid <- forkProcess localNode $ do
13501203 liftIO $ threadDelay 1000000
@@ -1353,18 +1206,17 @@ testKillLocal TestTransport{..} = do
13531206 ref <- monitor pid
13541207 us <- getSelfPid
13551208 kill pid "TestKill"
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"
1209+ ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1210+ True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1211+ liftIO $ putMVar done ()
1212+
1213+ takeMVar done
13631214
13641215testKillRemote :: TestTransport -> Assertion
13651216testKillRemote TestTransport{..} = do
13661217 node1 <- newLocalNode testTransport initRemoteTable
13671218 node2 <- newLocalNode testTransport initRemoteTable
1219+ done <- newEmptyMVar
13681220
13691221 pid <- forkProcess node1 $ do
13701222 liftIO $ threadDelay 1000000
@@ -1373,17 +1225,11 @@ testKillRemote TestTransport{..} = do
13731225 ref <- monitor pid
13741226 us <- getSelfPid
13751227 kill pid "TestKill"
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"
1228+ ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1229+ True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1230+ liftIO $ putMVar done ()
1231+
1232+ takeMVar done
13871233
13881234testCatchesExit :: TestTransport -> Assertion
13891235testCatchesExit TestTransport{..} = do
@@ -1409,10 +1255,7 @@ testHandleMessageIf TestTransport{..} = do
14091255 self <- getSelfPid
14101256 send self (5 :: Integer, 10 :: Integer)
14111257 msg <- receiveWait [ matchMessage return ]
1412− handleMessageIf msg
1413− (\() -> True)
1414− (\() -> die "whoops") >>= maybe (return ())
1415− (const $ die "Expected Mismatch")
1258+ Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
14161259 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
14171260 (\input -> liftIO $ putMVar done input)
14181261 return ()
@@ -1457,11 +1300,8 @@ testDie TestTransport{..} = do
14571300 (die ("foobar", 123 :: Int))
14581301 `catchExit` \_from reason -> do
14591302 -- TODO: should verify that 'from' has the right value
1460− let res = reason == ("foobar", 123 :: Int)
1303+ True <- return $ reason == ("foobar", 123 :: Int)
14611304 liftIO $ putMVar done ()
1462− if res
1463− then return ()
1464− else die "Something went horribly wrong"
14651305
14661306 takeMVar done
14671307
@@ -1475,11 +1315,8 @@ testPrettyExit TestTransport{..} = do
14751315 `catch` \ex@(ProcessExitException from _) ->
14761316 let expected = "exit-from=" ++ (show from)
14771317 in do
1478− let res = (show ex) == expected
1318+ True <- return $ (show ex) == expected
14791319 liftIO $ putMVar done ()
1480− if res
1481− then return ()
1482− else die "Something went horribly wrong"
14831320
14841321 takeMVar done
14851322
@@ -1495,26 +1332,17 @@ testExitLocal TestTransport{..} = do
14951332 pid <- forkProcess localNode $ do
14961333 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
14971334 -- TODO: should verify that 'from' has the right value
1498− res <- return $ reason == "TestExit"
1335+ True <- return $ reason == "TestExit"
14991336 liftIO $ putMVar supervisedDone ()
1500− if res
1501− then return ()
1502− else die "Something went horribly wrong"
15031337
15041338 runProcess localNode $ do
15051339 liftIO $ takeMVar handlerSetUp
15061340 ref <- monitor pid
15071341 exit pid "TestExit"
15081342 -- This time the client catches the exception, so it dies normally
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"
1343+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1344+ True <- return $ ref == ref' && pid == pid'
1345+ liftIO $ putMVar supervisorDone ()
15181346
15191347 takeMVar supervisedDone
15201348 takeMVar supervisorDone
@@ -1530,97 +1358,125 @@ testExitRemote TestTransport{..} = do
15301358 (receiveWait [] :: Process ()) -- block forever
15311359 `catchExit` \_from reason -> do
15321360 -- TODO: should verify that 'from' has the right value
1533− res <- return $ reason == "TestExit"
1361+ True <- return $ reason == "TestExit"
15341362 liftIO $ putMVar supervisedDone ()
1535− if res
1536− then return ()
1537− else die "Something went horribly wrong"
15381363
15391364 runProcess node2 $ do
15401365 ref <- monitor pid
15411366 exit pid "TestExit"
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"
1367+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1368+ True <- return $ ref == ref' && pid == pid'
1369+ liftIO $ putMVar supervisorDone ()
15511370
15521371 takeMVar supervisedDone
15531372 takeMVar supervisorDone
15541373
15551374testRegistryMonitoring :: TestTransport -> Assertion
15561375testRegistryMonitoring 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"
1376+ localNode <- newLocalNode testTransport initRemoteTable
1377+ remoteNode <- newLocalNode testTransport initRemoteTable
1378+ return ()
15671379
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
1380+ -- Local process. Test if local process will be removed from
1381+ -- registry when it dies.
1382+ box <- newEmptyMVar
1383+ runProcess localNode $ do
1384+ pid <- spawnLocal $ do
1385+ expect
1386+ register "test" pid
1387+ tpid <- whereis "test"
1388+ if tpid == Just pid
1389+ then do _ <- monitor pid
1390+ send pid ()
1391+ ProcessMonitorNotification{} <- expect
1392+ tpid1 <- whereis "test"
1393+ liftIO $ putMVar box (Nothing == tpid1)
1394+ else liftIO $ putMVar box False
1395+
1396+ takeMVar box >>= assertBool "expected local process to not be registered"
1397+ return ()
1398+
1399+ -- Remote process. Test if remote process entry is removed
1400+ -- from registry when process dies.
1401+ remote1 <- testRemote remoteNode
1402+ runProcess localNode $
1403+ let waitpoll = do
1404+ w <- whereis "test" :: Process (Maybe ProcessId)
1405+ forM_ w (const waitpoll)
1406+ in do register "test" remote1
1407+ send remote1 ()
1408+ waitpoll
1409+ return ()
1410+ return ()
1411+
1412+ -- Many labels. Test if all labels associated with process
1413+ -- are removed from registry when it dies.
1414+ remote2 <- testRemote remoteNode
1415+ runProcess localNode $
1416+ let waitpoll = do
1417+ w1 <- whereis "test-3" :: Process (Maybe ProcessId)
1418+ w2 <- whereis "test-4" :: Process (Maybe ProcessId)
1419+ forM_ (w1 <|> w2) (const waitpoll)
1420+ in do register "test-3" remote2
1421+ register "test-4" remote2
1422+ send remote2 ()
1423+ waitpoll
1424+ return ()
1425+
1426+{- XXX: waiting including patch for nsend for remote process
1427+ remote3 <- testRemote remoteNode
1428+ remote4 <- testRemote remoteNode
1429+ -- test many labels
1430+ runProcess localNode $ do
1431+ register "test-3" remote3
1432+ reregister "test-3" remote4
1433+ send remote3 ()
1434+ liftIO $ threadDelay 50000 -- XXX: racy
1435+ monitor remote4
1436+ nsend "test-3" ()
1437+ ProcessMonitorNotification{} <- expect
1438+ return ()
1439+-}
1440+
1441+ -- Test registerRemoteAsync properties. Add a local process to
1442+ -- remote registry and checks that it is removed
1443+ -- when the process dies.
1444+ remote5 <- testRemote remoteNode
1445+ runProcess localNode $ do
1446+ registerRemoteAsync (localNodeId remoteNode) "test" remote5
1447+ receiveWait [
1448+ match (\(RegisterReply _ True _) -> return ())
1449+ ] >>= send remote5
1450+ let waitpoll = do
1451+ whereisRemoteAsync (localNodeId remoteNode) "test"
1452+ receiveWait [
1453+ match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1454+ ]
1455+ waitpoll
16041456
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"
1457+ -- Add remote process to remote registry and checks if
1458+ -- entry is removed then process is dead.
1459+ remote6 <- testRemote localNode
1460+ runProcess localNode $ do
1461+ registerRemoteAsync (localNodeId remoteNode) "test" remote6
1462+ receiveWait [
1463+ match (\(RegisterReply _ True _) -> return ())
1464+ ] >>= send remote6
1465+ let waitpoll = do
1466+ whereisRemoteAsync (localNodeId remoteNode) "test"
1467+ receiveWait [
1468+ match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1469+ ]
1470+ waitpoll
1471+ where
1472+ testRemote node = do
1473+ -- test many labels
1474+ pidBox <- newEmptyMVar
1475+ forkProcess node $ do
1476+ us <- getSelfPid
1477+ liftIO $ putMVar pidBox us
1478+ expect :: Process ()
1479+ takeMVar pidBox
16241480
16251481testUnsafeSend :: TestTransport -> Assertion
16261482testUnsafeSend TestTransport{..} = do
@@ -1637,7 +1493,8 @@ testUnsafeSend TestTransport{..} = do
16371493 void $ forkProcess localNode $ do
16381494 serverPid <- liftIO $ takeMVar serverAddr
16391495 getSelfPid >>= unsafeSend serverPid
1640− expect >>= liftIO . putMVar clientDone
1496+ () <- expect
1497+ liftIO $ putMVar clientDone ()
16411498
16421499 takeMVar clientDone
16431500
@@ -1656,7 +1513,8 @@ testUnsafeUSend TestTransport{..} = do
16561513 void $ forkProcess localNode $ do
16571514 serverPid <- liftIO $ takeMVar serverAddr
16581515 getSelfPid >>= unsafeUSend serverPid
1659− expect >>= liftIO . putMVar clientDone
1516+ () <- expect
1517+ liftIO $ putMVar clientDone ()
16601518
16611519 takeMVar clientDone
16621520
@@ -1667,7 +1525,8 @@ testUnsafeNSend TestTransport{..} = do
16671525 localNode <- newLocalNode testTransport initRemoteTable
16681526
16691527 pid <- forkProcess localNode $ do
1670− expect >>= liftIO . putMVar clientDone
1528+ () <- expect
1529+ liftIO $ putMVar clientDone ()
16711530
16721531 void $ runProcess localNode $ do
16731532 register "foobar" pid
@@ -1685,7 +1544,8 @@ testUnsafeNSendRemote TestTransport{..} = do
16851544 _ <- forkProcess localNode1 $ do
16861545 getSelfPid >>= register "foobar"
16871546 liftIO $ putMVar clientDone ()
1688− expect >>= liftIO . putMVar clientDone
1547+ () <- expect
1548+ liftIO $ putMVar clientDone ()
16891549
16901550 takeMVar clientDone
16911551 void $ runProcess localNode2 $ do
@@ -1709,7 +1569,7 @@ testUnsafeSendChan TestTransport{..} = do
17091569 serverPid <- liftIO $ takeMVar serverAddr
17101570 (sp, rp) <- newChan
17111571 unsafeSend serverPid sp
1712− receiveChan rp :: Process ()
1572+ () <- receiveChan rp
17131573 liftIO $ putMVar clientDone ()
17141574
17151575 takeMVar clientDone
@@ -1723,8 +1583,8 @@ testCallLocal TestTransport{..} = do
17231583 runProcess node $ do
17241584 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
17251585 liftIO $ putMVar result r
1726−
1727− takeMVar result >>= assertBool "Expected 'True'"
1586+ True <- takeMVar result
1587+ return ()
17281588
17291589 -- Testing that when callLocal is interrupted, the worker is interrupted.
17301590 ibox <- newIORef False
@@ -1741,9 +1601,10 @@ testCallLocal TestTransport{..} = do
17411601 (send keeper ())
17421602 caller <- expect
17431603 exit caller "test"
1744− expect :: Process ()
1745−
1746− readIORef ibox >>= assertBool "Expected 'True'"
1604+ () <- expect
1605+ return ()
1606+ True <- readIORef ibox
1607+ return ()
17471608
17481609 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
17491610 ibox2 <- newIORef False
@@ -1752,8 +1613,8 @@ testCallLocal TestTransport{..} = do
17521613 liftIO $ writeIORef ibox2 $ case r of
17531614 Left (ErrorCall "e") -> True
17541615 _ -> False
1755−
1756− readIORef ibox >>= assertBool "Expected 'True'"
1616+ True <- readIORef ibox
1617+ return ()
17571618
17581619 -- Test that caller waits for the worker in correct situation
17591620 ibox3 <- newIORef False
@@ -1770,8 +1631,8 @@ testCallLocal TestTransport{..} = do
17701631 liftIO $ putMVar result3 =<< readIORef ibox3
17711632 worker <- expect
17721633 send worker ()
1773−
1774− takeMVar result3 >>= assertBool "Expected 'True'"
1634+ True <- takeMVar result3
1635+ return ()
17751636
17761637 -- Test that caller waits for the worker in case when caller gets an exception
17771638 ibox4 <- newIORef False
@@ -1787,10 +1648,14 @@ testCallLocal TestTransport{..} = do
17871648 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
17881649 caller <- expect
17891650 exit caller "hi!"
1790−
1791− takeMVar result4 >>= assertBool "Expected 'True'"
1651+ True <- takeMVar result4
1652+ return ()
17921653 -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
17931654
1655+
1656+
1657+
1658+
17941659tests :: TestTransport -> IO [Test]
17951660tests testtrans = return [
17961661 testGroup "Basic features" [
@@ -1814,7 +1679,6 @@ tests testtrans = return [
18141679 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
18151680 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
18161681 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817− , testCase "ChanLifecycle" (testChanLifecycle testtrans)
18181682 , testCase "KillLocal" (testKillLocal testtrans)
18191683 , testCase "KillRemote" (testKillRemote testtrans)
18201684 , testCase "Die" (testDie testtrans)
@@ -1824,7 +1688,7 @@ tests testtrans = return [
18241688 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
18251689 , testCase "ExitLocal" (testExitLocal testtrans)
18261690 , testCase "ExitRemote" (testExitRemote testtrans)
1827− , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
1691+ , testCase "TestRegistryMonitor" (testRegistryMonitoring testtrans)
18281692 , testCase "TextCallLocal" (testCallLocal testtrans)
18291693 -- Unsafe Primitives
18301694 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1877,3 +1741,17 @@ tests testtrans = return [
18771741 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
18781742 ]
18791743 ]
1744+
1745+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1746+syncBreakConnection breakConnection nid0 nid1 = do
1747+ m <- newEmptyMVar
1748+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1749+ runProcess nid0 $ do
1750+ them <- liftIO $ takeMVar m
1751+ pinger <- spawnLocal $ forever $ send them ()
1752+ _ <- monitorNode (localNodeId nid1)
1753+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1754+ (nodeAddress $ localNodeId nid1)
1755+ NodeMonitorNotification _ _ _ <- expect
1756+ kill pinger "finished"
1757+ return ()