@@ -25,32 +25,24 @@ 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
4338 )
4439import 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)
4840import Control.Distributed.Process.Serializable (Serializable)
49−import Data.Maybe (isNothing, isJust)
50−import Test.HUnit (Assertion, assertBool, assertFailure)
41+
42+import Test.HUnit (Assertion, assertFailure)
5143import Test.Framework (Test, testGroup)
5244import Test.Framework.Providers.HUnit (testCase)
53−import Control.Rematch hiding (match, isNothing, isJust)
45+import Control.Rematch hiding (match)
5446import Control.Rematch.Run (Match(..))
5547
5648newtype Ping = Ping ProcessId
@@ -73,7 +65,7 @@ expectThat a matcher = case res of
7365forkTry :: IO () -> IO ThreadId
7466forkTry p = do
7567 tid <- myThreadId
76− forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
68+ forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
7769
7870-- | The ping server from the paper
7971ping :: Process ()
@@ -83,46 +75,12 @@ ping = do
8375 send partner (Ping self)
8476 ping
8577
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−
9478-- | Quick and dirty synchronous version of whereisRemoteAsync
9579whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
9680whereisRemote nid string = do
9781 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 ()
82+ WhereIsReply _ mPid <- expect
83+ return mPid
12684
12785data Add = Add ProcessId Double Double deriving (Typeable)
12886data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -197,18 +155,12 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
197155 unmonitor ref
198156 liftIO $ putMVar done ()
199157 (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− ]
158+ ProcessMonitorNotification ref' pid reason' <- expect
159+ True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
160+ liftIO $ putMVar done ()
208161 )
209162 (\(ProcessLinkException pid reason') -> do
210− (liftIO $ assertBool "link exception unmatched" $
211− pid == theirAddr && not mOrL && not un && reason == reason')
163+ True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
212164 liftIO $ putMVar done ()
213165 )
214166
@@ -239,10 +191,8 @@ testPing TestTransport{..} = do
239191 pid <- getSelfPid
240192 replicateM_ numPings $ do
241193 send pingServer (Pong pid)
242− p <- expectTimeout 3000000
243− case p of
244− Just (Ping _) -> return ()
245− Nothing -> die "Failed to receive Ping"
194+ Ping _ <- expect
195+ return ()
246196
247197 putMVar clientDone ()
248198
@@ -329,7 +279,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
329279 runProcess localNode $ do
330280 monitor theirAddr
331281 -- wait for the process to die
332− expect :: Process ProcessMonitorNotification
282+ ProcessMonitorNotification _ _ _ <- expect
333283 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
334284
335285 takeMVar done
@@ -403,17 +353,14 @@ testMath TestTransport{..} = do
403353 runProcess localNode $ do
404354 pid <- getSelfPid
405355 send mathServer (Add pid 1 2)
406− three <- expect :: Process Double
356+ 3 <- expect :: Process Double
407357 send mathServer (Divide pid 8 2)
408− four <- expect :: Process Double
358+ 4 <- expect :: Process Double
409359 send mathServer (Divide pid 8 0)
410− divByZ <- expect
411− liftIO $ putMVar clientDone (three, four, divByZ)
360+ DivByZero <- expect
361+ liftIO $ putMVar clientDone ()
412362
413− res <- takeMVar clientDone
414− case res of
415− (3, 4, DivByZero) -> return ()
416− _ -> error $ "Something went horribly wrong"
363+ takeMVar clientDone
417364
418365-- | Send first message (i.e. connect) to an already terminated process
419366-- (without monitoring); then send another message to a second process on
@@ -441,9 +388,11 @@ testSendToTerminated TestTransport{..} = do
441388 pid <- getSelfPid
442389 send server1 "Hi"
443390 send server2 (Pong pid)
444− expectPing clientDone
391+ Ping pid' <- expect
392+ True <- return $ pid' == server2
393+ liftIO $ putMVar clientDone ()
445394
446− verifyClient "Expected Ping from server" clientDone
395+ takeMVar clientDone
447396
448397-- | Test (non-zero) timeout
449398testTimeout :: TestTransport -> Assertion
@@ -452,10 +401,10 @@ testTimeout TestTransport{..} = do
452401 done <- newEmptyMVar
453402
454403 runProcess localNode $ do
455− res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456− liftIO $ putMVar done $ res == Nothing
404+ Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
405+ liftIO $ putMVar done ()
457406
458− verifyClient "Expected receiveTimeout to timeout..." done
407+ takeMVar done
459408
460409-- | Test zero timeout
461410testTimeout0 :: TestTransport -> Assertion
@@ -483,9 +432,10 @@ testTimeout0 TestTransport{..} = do
483432 -- is not interested in, and then a single message that it wants
484433 replicateM_ 10000 $ send server "Irrelevant message"
485434 send server (Pong pid)
486− expectPing clientDone
435+ Ping _ <- expect
436+ liftIO $ putMVar clientDone ()
487437
488− verifyClient "Expected Ping from server" clientDone
438+ takeMVar clientDone
489439
490440-- | Test typed channels
491441testTypedChannels :: TestTransport -> Assertion
@@ -508,10 +458,10 @@ testTypedChannels TestTransport{..} = do
508458 runProcess localNode $ do
509459 (clientSendPort, rport) <- newChan
510460 sendChan serverSendPort (clientSendPort, 5)
511− ch <- receiveChan rport
512− liftIO $ putMVar clientDone $ ch == False
461+ False <- receiveChan rport
462+ liftIO $ putMVar clientDone ()
513463
514− verifyClient "Expected channel to send 'False'" clientDone
464+ takeMVar clientDone
515465
516466-- | Test merging receive ports
517467testMergeChannels :: TestTransport -> Assertion
@@ -534,8 +484,9 @@ testMergeChannels TestTransport{..} = do
534484 rs <- mapM charChannel "abc"
535485 m <- mergePorts biased rs
536486 xs <- replicateM 9 $ receiveChan m
537− liftIO $ putMVar done $ xs == expected
538− verifyClient "Expected single layer merge to match expected ordering" done
487+ True <- return $ xs == expected
488+ liftIO $ putMVar done ()
489+ takeMVar done
539490
540491 -- Two layers of merging
541492 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -546,8 +497,9 @@ testMergeChannels TestTransport{..} = do
546497 ms <- mapM (mergePorts biasedInner) rss
547498 m <- mergePorts biasedOuter ms
548499 xs <- replicateM (9 * 3) $ receiveChan m
549− liftIO $ putMVar done $ xs == expected
550− verifyClient "Expected nested channels to match expeted ordering" done
500+ True <- return $ xs == expected
501+ liftIO $ putMVar done ()
502+ takeMVar done
551503
552504 -- Test that if no messages are (immediately) available, the scheduler makes no difference
553505 testBlocked :: LocalNode -> Bool -> IO ()
@@ -556,45 +508,43 @@ testMergeChannels TestTransport{..} = do
556508 done <- newEmptyMVar
557509
558510 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"
511+ [sa, sb, sc] <- liftIO $ mapM readMVar vs
512+ mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
513+ [ -- a, b, c
514+ (sa, 'a')
515+ , (sb, 'b')
516+ , (sc, 'c')
517+ -- a, c, b
518+ , (sa, 'a')
519+ , (sc, 'c')
520+ , (sb, 'b')
521+ -- b, a, c
522+ , (sb, 'b')
523+ , (sa, 'a')
524+ , (sc, 'c')
525+ -- b, c, a
526+ , (sb, 'b')
527+ , (sc, 'c')
528+ , (sa, 'a')
529+ -- c, a, b
530+ , (sc, 'c')
531+ , (sa, 'a')
532+ , (sb, 'b')
533+ -- c, b, a
534+ , (sc, 'c')
535+ , (sb, 'b')
536+ , (sa, 'a')
537+ ]
589538
590539 forkProcess localNode $ do
591540 (ss, rs) <- unzip <$> replicateM 3 newChan
592541 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
593542 m <- mergePorts biased rs
594543 xs <- replicateM (6 * 3) $ receiveChan m
595− liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
544+ True <- return $ xs == "abcacbbacbcacabcba"
545+ liftIO $ putMVar done ()
596546
597− verifyClient "Expected merged ports to match expected ordering" done
547+ takeMVar done
598548
599549 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
600550 mergePorts True = mergePortsBiased
@@ -612,9 +562,8 @@ testTerminate TestTransport{..} = do
612562 localNode <- newLocalNode testTransport initRemoteTable
613563 runProcess localNode $ do
614564 e <- try terminate :: Process (Either ProcessTerminationException ())
615− if either show show e == show ProcessTerminationException
616− then return ()
617− else die "Unexpected result from terminate"
565+ True <- return $ either show show e == show ProcessTerminationException
566+ return ()
618567
619568testMonitorNode :: TestTransport -> Assertion
620569testMonitorNode TestTransport{..} = do
@@ -625,12 +574,11 @@ testMonitorNode TestTransport{..} = do
625574
626575 runProcess node2 $ do
627576 ref <- monitorNode (localNodeId node1)
628− receiveWait [
629− match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630− return $ ref == ref' && nid == localNodeId node1)
631− ] >>= liftIO . putMVar done
577+ NodeMonitorNotification ref' nid DiedDisconnect <- expect
578+ True <- return $ ref == ref' && nid == localNodeId node1
579+ liftIO $ putMVar done ()
632580
633− verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
581+ takeMVar done
634582
635583testMonitorLiveNode :: TestTransport -> Assertion
636584testMonitorLiveNode TestTransport{..} = do
@@ -645,16 +593,15 @@ testMonitorLiveNode TestTransport{..} = do
645593 liftIO $ putMVar ready ()
646594 liftIO $ takeMVar readyr
647595 send p ()
648− receiveWait [
649− match (\(NodeMonitorNotification ref' nid _) ->
650− (return $ ref == ref' && nid == localNodeId node1))
651− ] >>= liftIO . putMVar done
596+ NodeMonitorNotification ref' nid _ <- expect
597+ True <- return $ ref == ref' && nid == localNodeId node1
598+ liftIO $ putMVar done ()
652599
653600 takeMVar ready
654601 closeLocalNode node1
655602 putMVar readyr ()
656603
657− verifyClient "Expected NodeMonitorNotification for LIVE node" done
604+ takeMVar done
658605
659606testMonitorChannel :: TestTransport -> Assertion
660607testMonitorChannel TestTransport{..} = do
@@ -664,20 +611,18 @@ testMonitorChannel TestTransport{..} = do
664611 pid <- forkProcess node1 $ do
665612 sport <- expect :: Process (SendPort ())
666613 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
614+ PortMonitorNotification ref' port' reason <- expect
615+ -- reason might be DiedUnknownId if the receive port is GCed before the
616+ -- monitor is established (TODO: not sure that this is reasonable)
617+ return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
618+ liftIO $ putMVar gotNotification ()
674619
675620 runProcess node2 $ do
676621 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
677622 send pid sport
678623 liftIO $ threadDelay 100000
679624
680− verifyClient "Expected PortMonitorNotification" gotNotification
625+ takeMVar gotNotification
681626
682627testRegistry :: TestTransport -> Assertion
683628testRegistry TestTransport{..} = do
@@ -689,28 +634,20 @@ testRegistry TestTransport{..} = do
689634
690635 runProcess node $ do
691636 register "ping" pingServer
692− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
637+ Just pid <- whereis "ping"
638+ True <- return $ pingServer == pid
693639 us <- getSelfPid
694640 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
641+ Ping pid' <- expect
642+ True <- return $ pingServer == pid'
643+ Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
644+ Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
645+ True <- return $ x == pingServer
646+ Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
701647 liftIO $ putMVar done ()
702648
703649 takeMVar done
704650
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−
714651testRegistryRemoteProcess :: TestTransport -> Assertion
715652testRegistryRemoteProcess TestTransport{..} = do
716653 node1 <- newLocalNode testTransport initRemoteTable
@@ -721,13 +658,13 @@ testRegistryRemoteProcess TestTransport{..} = do
721658
722659 runProcess node2 $ do
723660 register "ping" pingServer
724− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
661+ Just pid <- whereis "ping"
662+ True <- return $ pingServer == pid
725663 us <- getSelfPid
726664 nsend "ping" (Pong us)
727− receiveWait [
728− matchIf (\(Ping pid') -> pingServer == pid')
729− (const $ liftIO $ putMVar done ())
730− ]
665+ Ping pid' <- expect
666+ True <- return $ pingServer == pid'
667+ liftIO $ putMVar done ()
731668
732669 takeMVar done
733670
@@ -735,6 +672,7 @@ testRemoteRegistry :: TestTransport -> Assertion
735672testRemoteRegistry TestTransport{..} = do
736673 node1 <- newLocalNode testTransport initRemoteTable
737674 node2 <- newLocalNode testTransport initRemoteTable
675+ done <- newEmptyMVar
738676
739677 pingServer <- forkProcess node1 ping
740678 deadProcess <- forkProcess node1 (return ())
@@ -747,34 +685,32 @@ testRemoteRegistry TestTransport{..} = do
747685 "ping" == label' && pid == pingServer)
748686 (\(RegisterReply _ _ _) -> return ()) ]
749687
750− pid <- verifyWhereIsRemote nid1 "ping"
751− liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752−
688+ Just pid <- whereisRemote nid1 "ping"
689+ True <- return $ pingServer == pid
753690 us <- getSelfPid
754691 nsendRemote nid1 "ping" (Pong us)
755− receiveWait [
756− match (\(Ping pid') -> return $ pingServer == pid')
757− ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
692+ Ping pid' <- expect
693+ True <- return $ pingServer == pid'
758694
759695 -- test that if process was not registered Nothing is returned
760696 -- in owner field.
761697 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−
698+ receiveWait [
699+ matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
700+ (\(RegisterReply _ _ _) -> return ()) ]
766701 registerRemoteAsync nid1 "ping" deadProcess
767702 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−
703+ matchIf (\(RegisterReply label' False (Just pid)) ->
704+ "ping" == label' && pid == pingServer)
705+ (\(RegisterReply _ _ _) -> return ()) ]
773706 unregisterRemoteAsync nid1 "dead"
774707 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"
708+ matchIf (\(RegisterReply label' False Nothing) ->
709+ "dead" == label' && pid == pingServer)
710+ (\(RegisterReply _ _ _) -> return ()) ]
711+ liftIO $ putMVar done ()
712+
713+ takeMVar done
778714
779715testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
780716testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -790,15 +726,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
790726 receiveWait [
791727 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
792728 (\(RegisterReply _ _ _) -> return ()) ]
793− pid <- verifyWhereIsRemote nid1 "ping"
794− liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
729+ Just pid <- whereisRemote nid1 "ping"
730+ True <- return $ pingServer == pid
795731 us <- getSelfPid
796732 nsendRemote nid1 "ping" (Pong us)
797− receiveWait [
798− match (\(Ping pid') -> return $ pingServer == pid')
799− ] >>= liftIO . putMVar done
733+ Ping pid' <- expect
734+ True <- return $ pingServer == pid'
735+ liftIO $ putMVar done ()
800736
801− verifyClient "Expected Ping with ping server's ProcessId" done
737+ takeMVar done
802738
803739testSpawnLocal :: TestTransport -> Assertion
804740testSpawnLocal TestTransport{..} = do
@@ -812,14 +748,15 @@ testSpawnLocal TestTransport{..} = do
812748 sport <- expect
813749 sendChan sport (1234 :: Int)
814750
815− sport <- spawnChannelLocal $
816− \rport -> (receiveChan rport :: Process Int) >>= send us
751+ sport <- spawnChannelLocal $ \rport -> do
752+ (1234 :: Int) <- receiveChan rport
753+ send us ()
817754
818755 send pid sport
819− expect >>= liftIO . putMVar done
756+ () <- expect
757+ liftIO $ putMVar done ()
820758
821− res <- takeMVar done
822− assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
759+ takeMVar done
823760
824761testSpawnAsyncStrictness :: TestTransport -> Assertion
825762testSpawnAsyncStrictness TestTransport{..} = do
@@ -848,9 +785,8 @@ testReconnect TestTransport{..} = do
848785 liftIO $ putMVar processA us
849786 msg1 <- expect
850787 msg2 <- expect
851− liftIO $ do
852− assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853− putMVar sendTestOk ()
788+ True <- return $ msg1 == "message 1" && msg2 == "message 3"
789+ liftIO $ putMVar sendTestOk ()
854790
855791 forkProcess node2 $ do
856792 {-
@@ -883,7 +819,7 @@ testReconnect TestTransport{..} = do
883819 matchIf (\(RegisterReply label' _ _) -> "a" == label')
884820 (\(RegisterReply _ _ _) -> return ()) ]
885821
886− _ <- whereisRemote nid1 "a"
822+ Just _ <- whereisRemote nid1 "a"
887823
888824
889825 -- Simulate network failure
@@ -902,10 +838,9 @@ testReconnect TestTransport{..} = do
902838 (\(RegisterReply _ _ _) -> return ()) ]
903839
904840 -- 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"
841+ Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
842+ Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
843+ Just _ <- whereisRemote nid1 "c"
909844
910845 liftIO $ putMVar registerTestOk ()
911846
@@ -946,19 +881,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
946881 isSorted _ = True
947882 -- The list can't be null since there are no failures after sending
948883 -- the last message.
949− liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
884+ True <- return $ isSorted msgs && not (null msgs)
885+ liftIO $ putMVar usendTestOk ()
950886
951887 forkProcess node2 $ do
952888 them <- liftIO $ readMVar processA
953889 getSelfPid >>= send them
954− expect :: Process ()
890+ () <- expect
955891 forM_ [1..numMessages] $ \i -> do
956892 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
957893 usendPrim them i
958894 liftIO (threadDelay 30000)
959895
960− res <- takeMVar usendTestOk
961− assertBool "Unexpected failure after sending last msg" res
896+ takeMVar usendTestOk
962897
963898-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
964899-- in between
@@ -984,17 +919,14 @@ testMatchAny TestTransport{..} = do
984919 runProcess localNode $ do
985920 pid <- getSelfPid
986921 send mathServer (Add pid 1 2)
987− three <- expect :: Process Double
922+ 3 <- expect :: Process Double
988923 send mathServer (Divide pid 8 2)
989− four <- expect :: Process Double
924+ 4 <- expect :: Process Double
990925 send mathServer (Divide pid 8 0)
991− divByZ <- expect
992− liftIO $ putMVar clientDone (three, four, divByZ)
926+ DivByZero <- expect
927+ liftIO $ putMVar clientDone ()
993928
994− res <- takeMVar clientDone
995− case res of
996− (3, 4, DivByZero) -> return ()
997− _ -> error "Unexpected result"
929+ takeMVar clientDone
998930
999931-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
1000932-- in between, however we block 'Divide' requests ....
@@ -1021,13 +953,12 @@ testMatchAnyHandle TestTransport{..} = do
1021953 runProcess localNode $ do
1022954 pid <- getSelfPid
1023955 send mathServer (Add pid 1 2)
1024− three <- expect :: Process Double
956+ 3 <- expect :: Process Double
1025957 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
958+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
959+ liftIO $ putMVar clientDone ()
1030960
961+ takeMVar clientDone
1031962 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1032963 maybeForward s msg =
1033964 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -1055,10 +986,8 @@ testMatchAnyNoHandle TestTransport{..} = do
1055986 Just _ -> die "NONSENSE")
1056987 ]
1057988 -- 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 ()
989+ Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
990+ liftIO $ putMVar serverDone ()
1062991 putMVar addr server
1063992
1064993 -- Client
@@ -1101,21 +1030,14 @@ testMatchAnyIf TestTransport{..} = do
11011030 runProcess localNode $ do
11021031 pid <- getSelfPid
11031032 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−
1033+ "foo" <- expect
11101034 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'
1035+ "baz" <- expect
1036+ send server (pid, "bar")
1037+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1038+ liftIO $ putMVar clientDone ()
11181039
1040+ takeMVar clientDone
11191041 where tryHandleMessage :: Message -> Process (Maybe ())
11201042 tryHandleMessage msg =
11211043 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1148,19 +1070,17 @@ testMatchMessageWithUnwrap TestTransport{..} = do
11481070 runProcess localNode $ do
11491071 pid <- getSelfPid
11501072 send server (pid, wrapMessage ("foo" :: String))
1151− foo <- expect
1073+ "foo" <- expect
11521074 send server (pid, wrapMessage ("baz" :: String))
1153− baz <- expect
1154− liftIO $ putMVar clientDone (foo, baz)
1075+ "baz" <- expect
1076+ liftIO $ putMVar clientDone ()
11551077
1156− res <- takeMVar clientDone
1157− assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1078+ takeMVar clientDone
11581079
11591080-- Test 'receiveChanTimeout'
11601081testReceiveChanTimeout :: TestTransport -> Assertion
11611082testReceiveChanTimeout TestTransport{..} = do
11621083 done <- newEmptyMVar
1163− mvSender <- newEmptyMVar
11641084 sendPort <- newEmptyMVar
11651085
11661086 forkTry $ do
@@ -1170,32 +1090,18 @@ testReceiveChanTimeout TestTransport{..} = do
11701090 (sp, rp) <- newChan :: Process (SendPort Bool, ReceivePort Bool)
11711091 liftIO $ putMVar sendPort sp
11721092
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 ()
1093+ -- Wait for a message with a delay. No message arrives, we should get Nothing after 1 second
1094+ Nothing <- receiveChanTimeout 1000000 rp
11791095
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
1096+ -- Wait for a message with a delay again. Now a message arrives after 0.5 seconds
1097+ Just True <- receiveChanTimeout 1000000 rp
11841098
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 ()
1099+ -- Wait for a message with zero timeout: non-blocking check. No message is available, we get Nothing
1100+ Nothing <- receiveChanTimeout 0 rp
11911101
11921102 -- Again, but now there is a message available
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
1103+ liftIO $ threadDelay 1000000
1104+ Just False <- receiveChanTimeout 0 rp
11991105
12001106 liftIO $ putMVar done ()
12011107
@@ -1204,11 +1110,10 @@ testReceiveChanTimeout TestTransport{..} = do
12041110 runProcess localNode $ do
12051111 sp <- liftIO $ readMVar sendPort
12061112
1207− liftIO $ takeMVar mvSender
1208− liftIO $ threadDelay 100000
1113+ liftIO $ threadDelay 1500000
12091114 sendChan sp True
12101115
1211− liftIO $ takeMVar mvSender
1116+ liftIO $ threadDelay 500000
12121117 sendChan sp False
12131118
12141119 takeMVar done
@@ -1231,8 +1136,8 @@ testReceiveChanFeatures TestTransport{..} = do
12311136
12321137 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
12331138
1234− receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235− receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1139+ True <- receiveChan rp1
1140+ False <- receiveChan rp1
12361141
12371142 -- Test Applicative instance
12381143
@@ -1241,7 +1146,7 @@ testReceiveChanFeatures TestTransport{..} = do
12411146
12421147 let rp2 = pure (+) <*> rpInt <*> rpInt
12431148
1244− receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1149+ 7 <- receiveChan rp2
12451150
12461151 -- Test Alternative instance
12471152
@@ -1250,8 +1155,8 @@ testReceiveChanFeatures TestTransport{..} = do
12501155
12511156 let rp3 = (even <$> rpInt) <|> rpBool
12521157
1253− receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254− receiveChan rp3 >>= liftIO . assertBool "Expected True"
1158+ False <- receiveChan rp3
1159+ True <- receiveChan rp3
12551160
12561161 -- Test Monad instance
12571162
@@ -1265,86 +1170,17 @@ testReceiveChanFeatures TestTransport{..} = do
12651170 then rpInt
12661171 else return 7
12671172
1268− receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269− receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1173+ 5 <- receiveChan rp4
1174+ 7 <- receiveChan rp4
12701175
12711176 liftIO $ putMVar done ()
12721177
12731178 takeMVar done
12741179
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−
13451180testKillLocal :: TestTransport -> Assertion
13461181testKillLocal TestTransport{..} = do
13471182 localNode <- newLocalNode testTransport initRemoteTable
1183+ done <- newEmptyMVar
13481184
13491185 pid <- forkProcess localNode $ do
13501186 liftIO $ threadDelay 1000000
@@ -1353,18 +1189,17 @@ testKillLocal TestTransport{..} = do
13531189 ref <- monitor pid
13541190 us <- getSelfPid
13551191 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"
1192+ ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1193+ True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1194+ liftIO $ putMVar done ()
1195+
1196+ takeMVar done
13631197
13641198testKillRemote :: TestTransport -> Assertion
13651199testKillRemote TestTransport{..} = do
13661200 node1 <- newLocalNode testTransport initRemoteTable
13671201 node2 <- newLocalNode testTransport initRemoteTable
1202+ done <- newEmptyMVar
13681203
13691204 pid <- forkProcess node1 $ do
13701205 liftIO $ threadDelay 1000000
@@ -1373,17 +1208,11 @@ testKillRemote TestTransport{..} = do
13731208 ref <- monitor pid
13741209 us <- getSelfPid
13751210 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"
1211+ ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1212+ True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1213+ liftIO $ putMVar done ()
1214+
1215+ takeMVar done
13871216
13881217testCatchesExit :: TestTransport -> Assertion
13891218testCatchesExit TestTransport{..} = do
@@ -1409,10 +1238,7 @@ testHandleMessageIf TestTransport{..} = do
14091238 self <- getSelfPid
14101239 send self (5 :: Integer, 10 :: Integer)
14111240 msg <- receiveWait [ matchMessage return ]
1412− handleMessageIf msg
1413− (\() -> True)
1414− (\() -> die "whoops") >>= maybe (return ())
1415− (const $ die "Expected Mismatch")
1241+ Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
14161242 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
14171243 (\input -> liftIO $ putMVar done input)
14181244 return ()
@@ -1457,11 +1283,8 @@ testDie TestTransport{..} = do
14571283 (die ("foobar", 123 :: Int))
14581284 `catchExit` \_from reason -> do
14591285 -- TODO: should verify that 'from' has the right value
1460− let res = reason == ("foobar", 123 :: Int)
1286+ True <- return $ reason == ("foobar", 123 :: Int)
14611287 liftIO $ putMVar done ()
1462− if res
1463− then return ()
1464− else die "Something went horribly wrong"
14651288
14661289 takeMVar done
14671290
@@ -1475,11 +1298,8 @@ testPrettyExit TestTransport{..} = do
14751298 `catch` \ex@(ProcessExitException from _) ->
14761299 let expected = "exit-from=" ++ (show from)
14771300 in do
1478− let res = (show ex) == expected
1301+ True <- return $ (show ex) == expected
14791302 liftIO $ putMVar done ()
1480− if res
1481− then return ()
1482− else die "Something went horribly wrong"
14831303
14841304 takeMVar done
14851305
@@ -1495,26 +1315,17 @@ testExitLocal TestTransport{..} = do
14951315 pid <- forkProcess localNode $ do
14961316 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
14971317 -- TODO: should verify that 'from' has the right value
1498− res <- return $ reason == "TestExit"
1318+ True <- return $ reason == "TestExit"
14991319 liftIO $ putMVar supervisedDone ()
1500− if res
1501− then return ()
1502− else die "Something went horribly wrong"
15031320
15041321 runProcess localNode $ do
15051322 liftIO $ takeMVar handlerSetUp
15061323 ref <- monitor pid
15071324 exit pid "TestExit"
15081325 -- 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"
1326+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1327+ True <- return $ ref == ref' && pid == pid'
1328+ liftIO $ putMVar supervisorDone ()
15181329
15191330 takeMVar supervisedDone
15201331 takeMVar supervisorDone
@@ -1530,98 +1341,19 @@ testExitRemote TestTransport{..} = do
15301341 (receiveWait [] :: Process ()) -- block forever
15311342 `catchExit` \_from reason -> do
15321343 -- TODO: should verify that 'from' has the right value
1533− res <- return $ reason == "TestExit"
1344+ True <- return $ reason == "TestExit"
15341345 liftIO $ putMVar supervisedDone ()
1535− if res
1536− then return ()
1537− else die "Something went horribly wrong"
15381346
15391347 runProcess node2 $ do
15401348 ref <- monitor pid
15411349 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"
1350+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1351+ True <- return $ ref == ref' && pid == pid'
1352+ liftIO $ putMVar supervisorDone ()
15511353
15521354 takeMVar supervisedDone
15531355 takeMVar supervisorDone
15541356
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−
16251357testUnsafeSend :: TestTransport -> Assertion
16261358testUnsafeSend TestTransport{..} = do
16271359 serverAddr <- newEmptyMVar
@@ -1637,7 +1369,8 @@ testUnsafeSend TestTransport{..} = do
16371369 void $ forkProcess localNode $ do
16381370 serverPid <- liftIO $ takeMVar serverAddr
16391371 getSelfPid >>= unsafeSend serverPid
1640− expect >>= liftIO . putMVar clientDone
1372+ () <- expect
1373+ liftIO $ putMVar clientDone ()
16411374
16421375 takeMVar clientDone
16431376
@@ -1656,7 +1389,8 @@ testUnsafeUSend TestTransport{..} = do
16561389 void $ forkProcess localNode $ do
16571390 serverPid <- liftIO $ takeMVar serverAddr
16581391 getSelfPid >>= unsafeUSend serverPid
1659− expect >>= liftIO . putMVar clientDone
1392+ () <- expect
1393+ liftIO $ putMVar clientDone ()
16601394
16611395 takeMVar clientDone
16621396
@@ -1667,7 +1401,8 @@ testUnsafeNSend TestTransport{..} = do
16671401 localNode <- newLocalNode testTransport initRemoteTable
16681402
16691403 pid <- forkProcess localNode $ do
1670− expect >>= liftIO . putMVar clientDone
1404+ () <- expect
1405+ liftIO $ putMVar clientDone ()
16711406
16721407 void $ runProcess localNode $ do
16731408 register "foobar" pid
@@ -1685,7 +1420,8 @@ testUnsafeNSendRemote TestTransport{..} = do
16851420 _ <- forkProcess localNode1 $ do
16861421 getSelfPid >>= register "foobar"
16871422 liftIO $ putMVar clientDone ()
1688− expect >>= liftIO . putMVar clientDone
1423+ () <- expect
1424+ liftIO $ putMVar clientDone ()
16891425
16901426 takeMVar clientDone
16911427 void $ runProcess localNode2 $ do
@@ -1709,7 +1445,7 @@ testUnsafeSendChan TestTransport{..} = do
17091445 serverPid <- liftIO $ takeMVar serverAddr
17101446 (sp, rp) <- newChan
17111447 unsafeSend serverPid sp
1712− receiveChan rp :: Process ()
1448+ () <- receiveChan rp
17131449 liftIO $ putMVar clientDone ()
17141450
17151451 takeMVar clientDone
@@ -1723,8 +1459,8 @@ testCallLocal TestTransport{..} = do
17231459 runProcess node $ do
17241460 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
17251461 liftIO $ putMVar result r
1726−
1727− takeMVar result >>= assertBool "Expected 'True'"
1462+ True <- takeMVar result
1463+ return ()
17281464
17291465 -- Testing that when callLocal is interrupted, the worker is interrupted.
17301466 ibox <- newIORef False
@@ -1741,9 +1477,10 @@ testCallLocal TestTransport{..} = do
17411477 (send keeper ())
17421478 caller <- expect
17431479 exit caller "test"
1744− expect :: Process ()
1745−
1746− readIORef ibox >>= assertBool "Expected 'True'"
1480+ () <- expect
1481+ return ()
1482+ True <- readIORef ibox
1483+ return ()
17471484
17481485 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
17491486 ibox2 <- newIORef False
@@ -1752,8 +1489,8 @@ testCallLocal TestTransport{..} = do
17521489 liftIO $ writeIORef ibox2 $ case r of
17531490 Left (ErrorCall "e") -> True
17541491 _ -> False
1755−
1756− readIORef ibox >>= assertBool "Expected 'True'"
1492+ True <- readIORef ibox
1493+ return ()
17571494
17581495 -- Test that caller waits for the worker in correct situation
17591496 ibox3 <- newIORef False
@@ -1770,8 +1507,8 @@ testCallLocal TestTransport{..} = do
17701507 liftIO $ putMVar result3 =<< readIORef ibox3
17711508 worker <- expect
17721509 send worker ()
1773−
1774− takeMVar result3 >>= assertBool "Expected 'True'"
1510+ True <- takeMVar result3
1511+ return ()
17751512
17761513 -- Test that caller waits for the worker in case when caller gets an exception
17771514 ibox4 <- newIORef False
@@ -1787,10 +1524,14 @@ testCallLocal TestTransport{..} = do
17871524 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
17881525 caller <- expect
17891526 exit caller "hi!"
1790−
1791− takeMVar result4 >>= assertBool "Expected 'True'"
1527+ True <- takeMVar result4
1528+ return ()
17921529 -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
17931530
1531+
1532+
1533+
1534+
17941535tests :: TestTransport -> IO [Test]
17951536tests testtrans = return [
17961537 testGroup "Basic features" [
@@ -1814,7 +1555,6 @@ tests testtrans = return [
18141555 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
18151556 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
18161557 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817− , testCase "ChanLifecycle" (testChanLifecycle testtrans)
18181558 , testCase "KillLocal" (testKillLocal testtrans)
18191559 , testCase "KillRemote" (testKillRemote testtrans)
18201560 , testCase "Die" (testDie testtrans)
@@ -1824,7 +1564,6 @@ tests testtrans = return [
18241564 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
18251565 , testCase "ExitLocal" (testExitLocal testtrans)
18261566 , testCase "ExitRemote" (testExitRemote testtrans)
1827− , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
18281567 , testCase "TextCallLocal" (testCallLocal testtrans)
18291568 -- Unsafe Primitives
18301569 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1877,3 +1616,17 @@ tests testtrans = return [
18771616 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
18781617 ]
18791618 ]
1619+
1620+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1621+syncBreakConnection breakConnection nid0 nid1 = do
1622+ m <- newEmptyMVar
1623+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1624+ runProcess nid0 $ do
1625+ them <- liftIO $ takeMVar m
1626+ pinger <- spawnLocal $ forever $ send them ()
1627+ _ <- monitorNode (localNodeId nid1)
1628+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1629+ (nodeAddress $ localNodeId nid1)
1630+ NodeMonitorNotification _ _ _ <- expect
1631+ kill pinger "finished"
1632+ return ()