@@ -42,15 +42,12 @@ import Control.Distributed.Process.Internal.Types
4242 , createUnencodedMessage
4343 )
4444import Control.Distributed.Process.Node
45−import Control.Distributed.Process.Debug
46−import Control.Distributed.Process.Management.Internal.Types
47−import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
4845import Control.Distributed.Process.Serializable (Serializable)
49−import Data.Maybe (isNothing, isJust)
50−import Test.HUnit (Assertion, assertBool, assertFailure)
46+
47+import Test.HUnit (Assertion, assertFailure)
5148import Test.Framework (Test, testGroup)
5249import Test.Framework.Providers.HUnit (testCase)
53−import Control.Rematch hiding (match, isNothing, isJust)
50+import Control.Rematch hiding (match)
5451import Control.Rematch.Run (Match(..))
5552
5653newtype Ping = Ping ProcessId
@@ -83,46 +80,12 @@ ping = do
8380 send partner (Ping self)
8481 ping
8582
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−
9483-- | Quick and dirty synchronous version of whereisRemoteAsync
9584whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
9685whereisRemote nid string = do
9786 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 ()
87+ WhereIsReply _ mPid <- expect
88+ return mPid
12689
12790data Add = Add ProcessId Double Double deriving (Typeable)
12891data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -197,18 +160,12 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
197160 unmonitor ref
198161 liftIO $ putMVar done ()
199162 (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− ]
163+ ProcessMonitorNotification ref' pid reason' <- expect
164+ True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
165+ liftIO $ putMVar done ()
208166 )
209167 (\(ProcessLinkException pid reason') -> do
210− (liftIO $ assertBool "link exception unmatched" $
211− pid == theirAddr && not mOrL && not un && reason == reason')
168+ True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
212169 liftIO $ putMVar done ()
213170 )
214171
@@ -239,10 +196,8 @@ testPing TestTransport{..} = do
239196 pid <- getSelfPid
240197 replicateM_ numPings $ do
241198 send pingServer (Pong pid)
242− p <- expectTimeout 3000000
243− case p of
244− Just (Ping _) -> return ()
245− Nothing -> die "Failed to receive Ping"
199+ Ping _ <- expect
200+ return ()
246201
247202 putMVar clientDone ()
248203
@@ -329,7 +284,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
329284 runProcess localNode $ do
330285 monitor theirAddr
331286 -- wait for the process to die
332− expect :: Process ProcessMonitorNotification
287+ ProcessMonitorNotification _ _ _ <- expect
333288 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
334289
335290 takeMVar done
@@ -403,17 +358,14 @@ testMath TestTransport{..} = do
403358 runProcess localNode $ do
404359 pid <- getSelfPid
405360 send mathServer (Add pid 1 2)
406− three <- expect :: Process Double
361+ 3 <- expect :: Process Double
407362 send mathServer (Divide pid 8 2)
408− four <- expect :: Process Double
363+ 4 <- expect :: Process Double
409364 send mathServer (Divide pid 8 0)
410− divByZ <- expect
411− liftIO $ putMVar clientDone (three, four, divByZ)
365+ DivByZero <- expect
366+ liftIO $ putMVar clientDone ()
412367
413− res <- takeMVar clientDone
414− case res of
415− (3, 4, DivByZero) -> return ()
416− _ -> error $ "Something went horribly wrong"
368+ takeMVar clientDone
417369
418370-- | Send first message (i.e. connect) to an already terminated process
419371-- (without monitoring); then send another message to a second process on
@@ -441,9 +393,11 @@ testSendToTerminated TestTransport{..} = do
441393 pid <- getSelfPid
442394 send server1 "Hi"
443395 send server2 (Pong pid)
444− expectPing clientDone
396+ Ping pid' <- expect
397+ True <- return $ pid' == server2
398+ liftIO $ putMVar clientDone ()
445399
446− verifyClient "Expected Ping from server" clientDone
400+ takeMVar clientDone
447401
448402-- | Test (non-zero) timeout
449403testTimeout :: TestTransport -> Assertion
@@ -452,10 +406,10 @@ testTimeout TestTransport{..} = do
452406 done <- newEmptyMVar
453407
454408 runProcess localNode $ do
455− res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456− liftIO $ putMVar done $ res == Nothing
409+ Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
410+ liftIO $ putMVar done ()
457411
458− verifyClient "Expected receiveTimeout to timeout..." done
412+ takeMVar done
459413
460414-- | Test zero timeout
461415testTimeout0 :: TestTransport -> Assertion
@@ -483,9 +437,10 @@ testTimeout0 TestTransport{..} = do
483437 -- is not interested in, and then a single message that it wants
484438 replicateM_ 10000 $ send server "Irrelevant message"
485439 send server (Pong pid)
486− expectPing clientDone
440+ Ping _ <- expect
441+ liftIO $ putMVar clientDone ()
487442
488− verifyClient "Expected Ping from server" clientDone
443+ takeMVar clientDone
489444
490445-- | Test typed channels
491446testTypedChannels :: TestTransport -> Assertion
@@ -508,10 +463,10 @@ testTypedChannels TestTransport{..} = do
508463 runProcess localNode $ do
509464 (clientSendPort, rport) <- newChan
510465 sendChan serverSendPort (clientSendPort, 5)
511− ch <- receiveChan rport
512− liftIO $ putMVar clientDone $ ch == False
466+ False <- receiveChan rport
467+ liftIO $ putMVar clientDone ()
513468
514− verifyClient "Expected channel to send 'False'" clientDone
469+ takeMVar clientDone
515470
516471-- | Test merging receive ports
517472testMergeChannels :: TestTransport -> Assertion
@@ -534,8 +489,9 @@ testMergeChannels TestTransport{..} = do
534489 rs <- mapM charChannel "abc"
535490 m <- mergePorts biased rs
536491 xs <- replicateM 9 $ receiveChan m
537− liftIO $ putMVar done $ xs == expected
538− verifyClient "Expected single layer merge to match expected ordering" done
492+ True <- return $ xs == expected
493+ liftIO $ putMVar done ()
494+ takeMVar done
539495
540496 -- Two layers of merging
541497 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -546,8 +502,9 @@ testMergeChannels TestTransport{..} = do
546502 ms <- mapM (mergePorts biasedInner) rss
547503 m <- mergePorts biasedOuter ms
548504 xs <- replicateM (9 * 3) $ receiveChan m
549− liftIO $ putMVar done $ xs == expected
550− verifyClient "Expected nested channels to match expeted ordering" done
505+ True <- return $ xs == expected
506+ liftIO $ putMVar done ()
507+ takeMVar done
551508
552509 -- Test that if no messages are (immediately) available, the scheduler makes no difference
553510 testBlocked :: LocalNode -> Bool -> IO ()
@@ -556,45 +513,43 @@ testMergeChannels TestTransport{..} = do
556513 done <- newEmptyMVar
557514
558515 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"
516+ [sa, sb, sc] <- liftIO $ mapM readMVar vs
517+ mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
518+ [ -- a, b, c
519+ (sa, 'a')
520+ , (sb, 'b')
521+ , (sc, 'c')
522+ -- a, c, b
523+ , (sa, 'a')
524+ , (sc, 'c')
525+ , (sb, 'b')
526+ -- b, a, c
527+ , (sb, 'b')
528+ , (sa, 'a')
529+ , (sc, 'c')
530+ -- b, c, a
531+ , (sb, 'b')
532+ , (sc, 'c')
533+ , (sa, 'a')
534+ -- c, a, b
535+ , (sc, 'c')
536+ , (sa, 'a')
537+ , (sb, 'b')
538+ -- c, b, a
539+ , (sc, 'c')
540+ , (sb, 'b')
541+ , (sa, 'a')
542+ ]
589543
590544 forkProcess localNode $ do
591545 (ss, rs) <- unzip <$> replicateM 3 newChan
592546 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
593547 m <- mergePorts biased rs
594548 xs <- replicateM (6 * 3) $ receiveChan m
595− liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
549+ True <- return $ xs == "abcacbbacbcacabcba"
550+ liftIO $ putMVar done ()
596551
597− verifyClient "Expected merged ports to match expected ordering" done
552+ takeMVar done
598553
599554 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
600555 mergePorts True = mergePortsBiased
@@ -612,9 +567,8 @@ testTerminate TestTransport{..} = do
612567 localNode <- newLocalNode testTransport initRemoteTable
613568 runProcess localNode $ do
614569 e <- try terminate :: Process (Either ProcessTerminationException ())
615− if either show show e == show ProcessTerminationException
616− then return ()
617− else die "Unexpected result from terminate"
570+ True <- return $ either show show e == show ProcessTerminationException
571+ return ()
618572
619573testMonitorNode :: TestTransport -> Assertion
620574testMonitorNode TestTransport{..} = do
@@ -625,12 +579,11 @@ testMonitorNode TestTransport{..} = do
625579
626580 runProcess node2 $ do
627581 ref <- monitorNode (localNodeId node1)
628− receiveWait [
629− match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630− return $ ref == ref' && nid == localNodeId node1)
631− ] >>= liftIO . putMVar done
582+ NodeMonitorNotification ref' nid DiedDisconnect <- expect
583+ True <- return $ ref == ref' && nid == localNodeId node1
584+ liftIO $ putMVar done ()
632585
633− verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
586+ takeMVar done
634587
635588testMonitorLiveNode :: TestTransport -> Assertion
636589testMonitorLiveNode TestTransport{..} = do
@@ -645,16 +598,15 @@ testMonitorLiveNode TestTransport{..} = do
645598 liftIO $ putMVar ready ()
646599 liftIO $ takeMVar readyr
647600 send p ()
648− receiveWait [
649− match (\(NodeMonitorNotification ref' nid _) ->
650− (return $ ref == ref' && nid == localNodeId node1))
651− ] >>= liftIO . putMVar done
601+ NodeMonitorNotification ref' nid _ <- expect
602+ True <- return $ ref == ref' && nid == localNodeId node1
603+ liftIO $ putMVar done ()
652604
653605 takeMVar ready
654606 closeLocalNode node1
655607 putMVar readyr ()
656608
657− verifyClient "Expected NodeMonitorNotification for LIVE node" done
609+ takeMVar done
658610
659611testMonitorChannel :: TestTransport -> Assertion
660612testMonitorChannel TestTransport{..} = do
@@ -664,20 +616,18 @@ testMonitorChannel TestTransport{..} = do
664616 pid <- forkProcess node1 $ do
665617 sport <- expect :: Process (SendPort ())
666618 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
619+ PortMonitorNotification ref' port' reason <- expect
620+ -- reason might be DiedUnknownId if the receive port is GCed before the
621+ -- monitor is established (TODO: not sure that this is reasonable)
622+ return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
623+ liftIO $ putMVar gotNotification ()
674624
675625 runProcess node2 $ do
676626 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
677627 send pid sport
678628 liftIO $ threadDelay 100000
679629
680− verifyClient "Expected PortMonitorNotification" gotNotification
630+ takeMVar gotNotification
681631
682632testRegistry :: TestTransport -> Assertion
683633testRegistry TestTransport{..} = do
@@ -689,28 +639,20 @@ testRegistry TestTransport{..} = do
689639
690640 runProcess node $ do
691641 register "ping" pingServer
692− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
642+ Just pid <- whereis "ping"
643+ True <- return $ pingServer == pid
693644 us <- getSelfPid
694645 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
646+ Ping pid' <- expect
647+ True <- return $ pingServer == pid'
648+ Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
649+ Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
650+ True <- return $ x == pingServer
651+ Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
701652 liftIO $ putMVar done ()
702653
703654 takeMVar done
704655
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−
714656testRegistryRemoteProcess :: TestTransport -> Assertion
715657testRegistryRemoteProcess TestTransport{..} = do
716658 node1 <- newLocalNode testTransport initRemoteTable
@@ -721,13 +663,13 @@ testRegistryRemoteProcess TestTransport{..} = do
721663
722664 runProcess node2 $ do
723665 register "ping" pingServer
724− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
666+ Just pid <- whereis "ping"
667+ True <- return $ pingServer == pid
725668 us <- getSelfPid
726669 nsend "ping" (Pong us)
727− receiveWait [
728− matchIf (\(Ping pid') -> pingServer == pid')
729− (const $ liftIO $ putMVar done ())
730− ]
670+ Ping pid' <- expect
671+ True <- return $ pingServer == pid'
672+ liftIO $ putMVar done ()
731673
732674 takeMVar done
733675
@@ -735,6 +677,7 @@ testRemoteRegistry :: TestTransport -> Assertion
735677testRemoteRegistry TestTransport{..} = do
736678 node1 <- newLocalNode testTransport initRemoteTable
737679 node2 <- newLocalNode testTransport initRemoteTable
680+ done <- newEmptyMVar
738681
739682 pingServer <- forkProcess node1 ping
740683 deadProcess <- forkProcess node1 (return ())
@@ -747,34 +690,32 @@ testRemoteRegistry TestTransport{..} = do
747690 "ping" == label' && pid == pingServer)
748691 (\(RegisterReply _ _ _) -> return ()) ]
749692
750− pid <- verifyWhereIsRemote nid1 "ping"
751− liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752−
693+ Just pid <- whereisRemote nid1 "ping"
694+ True <- return $ pingServer == pid
753695 us <- getSelfPid
754696 nsendRemote nid1 "ping" (Pong us)
755− receiveWait [
756− match (\(Ping pid') -> return $ pingServer == pid')
757− ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
697+ Ping pid' <- expect
698+ True <- return $ pingServer == pid'
758699
759700 -- test that if process was not registered Nothing is returned
760701 -- in owner field.
761702 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−
703+ receiveWait [
704+ matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
705+ (\(RegisterReply _ _ _) -> return ()) ]
766706 registerRemoteAsync nid1 "ping" deadProcess
767707 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−
708+ matchIf (\(RegisterReply label' False (Just pid'')) ->
709+ "ping" == label' && pid'' == pingServer)
710+ (\(RegisterReply _ _ _) -> return ()) ]
773711 unregisterRemoteAsync nid1 "dead"
774712 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"
713+ matchIf (\(RegisterReply label' False Nothing) ->
714+ "dead" == label' && pid == pingServer)
715+ (\(RegisterReply _ _ _) -> return ()) ]
716+ liftIO $ putMVar done ()
717+
718+ takeMVar done
778719
779720testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
780721testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -790,15 +731,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
790731 receiveWait [
791732 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
792733 (\(RegisterReply _ _ _) -> return ()) ]
793− pid <- verifyWhereIsRemote nid1 "ping"
794− liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
734+ Just pid <- whereisRemote nid1 "ping"
735+ True <- return $ pingServer == pid
795736 us <- getSelfPid
796737 nsendRemote nid1 "ping" (Pong us)
797− receiveWait [
798− match (\(Ping pid') -> return $ pingServer == pid')
799− ] >>= liftIO . putMVar done
738+ Ping pid' <- expect
739+ True <- return $ pingServer == pid'
740+ liftIO $ putMVar done ()
800741
801− verifyClient "Expected Ping with ping server's ProcessId" done
742+ takeMVar done
802743
803744testSpawnLocal :: TestTransport -> Assertion
804745testSpawnLocal TestTransport{..} = do
@@ -812,14 +753,15 @@ testSpawnLocal TestTransport{..} = do
812753 sport <- expect
813754 sendChan sport (1234 :: Int)
814755
815− sport <- spawnChannelLocal $
816− \rport -> (receiveChan rport :: Process Int) >>= send us
756+ sport <- spawnChannelLocal $ \rport -> do
757+ (1234 :: Int) <- receiveChan rport
758+ send us ()
817759
818760 send pid sport
819− expect >>= liftIO . putMVar done
761+ () <- expect
762+ liftIO $ putMVar done ()
820763
821− res <- takeMVar done
822− assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
764+ takeMVar done
823765
824766testSpawnAsyncStrictness :: TestTransport -> Assertion
825767testSpawnAsyncStrictness TestTransport{..} = do
@@ -848,9 +790,8 @@ testReconnect TestTransport{..} = do
848790 liftIO $ putMVar processA us
849791 msg1 <- expect
850792 msg2 <- expect
851− liftIO $ do
852− assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853− putMVar sendTestOk ()
793+ True <- return $ msg1 == "message 1" && msg2 == "message 3"
794+ liftIO $ putMVar sendTestOk ()
854795
855796 forkProcess node2 $ do
856797 {-
@@ -883,7 +824,7 @@ testReconnect TestTransport{..} = do
883824 matchIf (\(RegisterReply label' _ _) -> "a" == label')
884825 (\(RegisterReply _ _ _) -> return ()) ]
885826
886− _ <- whereisRemote nid1 "a"
827+ Just _ <- whereisRemote nid1 "a"
887828
888829
889830 -- Simulate network failure
@@ -902,10 +843,9 @@ testReconnect TestTransport{..} = do
902843 (\(RegisterReply _ _ _) -> return ()) ]
903844
904845 -- 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"
846+ Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
847+ Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
848+ Just _ <- whereisRemote nid1 "c"
909849
910850 liftIO $ putMVar registerTestOk ()
911851
@@ -946,19 +886,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
946886 isSorted _ = True
947887 -- The list can't be null since there are no failures after sending
948888 -- the last message.
949− liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
889+ True <- return $ isSorted msgs && not (null msgs)
890+ liftIO $ putMVar usendTestOk ()
950891
951892 forkProcess node2 $ do
952893 them <- liftIO $ readMVar processA
953894 getSelfPid >>= send them
954− expect :: Process ()
895+ () <- expect
955896 forM_ [1..numMessages] $ \i -> do
956897 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
957898 usendPrim them i
958899 liftIO (threadDelay 30000)
959900
960− res <- takeMVar usendTestOk
961− assertBool "Unexpected failure after sending last msg" res
901+ takeMVar usendTestOk
962902
963903-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
964904-- in between
@@ -984,17 +924,14 @@ testMatchAny TestTransport{..} = do
984924 runProcess localNode $ do
985925 pid <- getSelfPid
986926 send mathServer (Add pid 1 2)
987− three <- expect :: Process Double
927+ 3 <- expect :: Process Double
988928 send mathServer (Divide pid 8 2)
989− four <- expect :: Process Double
929+ 4 <- expect :: Process Double
990930 send mathServer (Divide pid 8 0)
991− divByZ <- expect
992− liftIO $ putMVar clientDone (three, four, divByZ)
931+ DivByZero <- expect
932+ liftIO $ putMVar clientDone ()
993933
994− res <- takeMVar clientDone
995− case res of
996− (3, 4, DivByZero) -> return ()
997− _ -> error "Unexpected result"
934+ takeMVar clientDone
998935
999936-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
1000937-- in between, however we block 'Divide' requests ....
@@ -1021,13 +958,12 @@ testMatchAnyHandle TestTransport{..} = do
1021958 runProcess localNode $ do
1022959 pid <- getSelfPid
1023960 send mathServer (Add pid 1 2)
1024− three <- expect :: Process Double
961+ 3 <- expect :: Process Double
1025962 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
963+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
964+ liftIO $ putMVar clientDone ()
1030965
966+ takeMVar clientDone
1031967 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1032968 maybeForward s msg =
1033969 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -1055,10 +991,8 @@ testMatchAnyNoHandle TestTransport{..} = do
1055991 Just _ -> die "NONSENSE")
1056992 ]
1057993 -- 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 ()
994+ Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
995+ liftIO $ putMVar serverDone ()
1062996 putMVar addr server
1063997
1064998 -- Client
@@ -1101,21 +1035,14 @@ testMatchAnyIf TestTransport{..} = do
11011035 runProcess localNode $ do
11021036 pid <- getSelfPid
11031037 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−
1038+ "foo" <- expect
11101039 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'
1040+ "baz" <- expect
1041+ send server (pid, "bar")
1042+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1043+ liftIO $ putMVar clientDone ()
11181044
1045+ takeMVar clientDone
11191046 where tryHandleMessage :: Message -> Process (Maybe ())
11201047 tryHandleMessage msg =
11211048 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1148,13 +1075,12 @@ testMatchMessageWithUnwrap TestTransport{..} = do
11481075 runProcess localNode $ do
11491076 pid <- getSelfPid
11501077 send server (pid, wrapMessage ("foo" :: String))
1151− foo <- expect
1078+ "foo" <- expect
11521079 send server (pid, wrapMessage ("baz" :: String))
1153− baz <- expect
1154− liftIO $ putMVar clientDone (foo, baz)
1080+ "baz" <- expect
1081+ liftIO $ putMVar clientDone ()
11551082
1156− res <- takeMVar clientDone
1157− assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1083+ takeMVar clientDone
11581084
11591085-- Test 'receiveChanTimeout'
11601086testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1172,19 +1098,18 @@ testReceiveChanTimeout TestTransport{..} = do
11721098
11731099 -- Wait for a message with a delay. No message arrives, we should get
11741100 -- Nothing after the delay.
1175− receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1101+ Nothing <- receiveChanTimeout 100000 rp
11761102
11771103 -- Let the sender know that it can send a message.
11781104 liftIO $ putMVar mvSender ()
11791105
11801106 -- Wait for a message with a delay again. Now a message arrives after
11811107 -- 0.1 seconds
1182− res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1183− liftIO $ assertBool "Expected result to be 'True'" res
1108+ Just True <- receiveChanTimeout 20000000 rp
11841109
11851110 -- Wait for a message with zero timeout: non-blocking check. No message is
11861111 -- available, we get Nothing
1187− receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1112+ Nothing <- receiveChanTimeout 0 rp
11881113
11891114 -- Let the sender know that it can send a message.
11901115 liftIO $ putMVar mvSender ()
@@ -1194,7 +1119,7 @@ testReceiveChanTimeout TestTransport{..} = do
11941119 liftIO $ threadDelay 100000
11951120 mb <- receiveChanTimeout 0 rp
11961121 case mb of
1197− Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1122+ Just b -> do False <- return b; return ()
11981123 _ -> loop
11991124
12001125 liftIO $ putMVar done ()
@@ -1231,8 +1156,8 @@ testReceiveChanFeatures TestTransport{..} = do
12311156
12321157 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
12331158
1234− receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235− receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1159+ True <- receiveChan rp1
1160+ False <- receiveChan rp1
12361161
12371162 -- Test Applicative instance
12381163
@@ -1241,7 +1166,7 @@ testReceiveChanFeatures TestTransport{..} = do
12411166
12421167 let rp2 = pure (+) <*> rpInt <*> rpInt
12431168
1244− receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1169+ 7 <- receiveChan rp2
12451170
12461171 -- Test Alternative instance
12471172
@@ -1250,8 +1175,8 @@ testReceiveChanFeatures TestTransport{..} = do
12501175
12511176 let rp3 = (even <$> rpInt) <|> rpBool
12521177
1253− receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254− receiveChan rp3 >>= liftIO . assertBool "Expected True"
1178+ False <- receiveChan rp3
1179+ True <- receiveChan rp3
12551180
12561181 -- Test Monad instance
12571182
@@ -1265,86 +1190,17 @@ testReceiveChanFeatures TestTransport{..} = do
12651190 then rpInt
12661191 else return 7
12671192
1268− receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269− receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1193+ 5 <- receiveChan rp4
1194+ 7 <- receiveChan rp4
12701195
12711196 liftIO $ putMVar done ()
12721197
12731198 takeMVar done
12741199
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−
13451200testKillLocal :: TestTransport -> Assertion
13461201testKillLocal TestTransport{..} = do
13471202 localNode <- newLocalNode testTransport initRemoteTable
1203+ done <- newEmptyMVar
13481204
13491205 pid <- forkProcess localNode $ do
13501206 liftIO $ threadDelay 1000000
@@ -1353,18 +1209,17 @@ testKillLocal TestTransport{..} = do
13531209 ref <- monitor pid
13541210 us <- getSelfPid
13551211 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"
1212+ ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1213+ True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1214+ liftIO $ putMVar done ()
1215+
1216+ takeMVar done
13631217
13641218testKillRemote :: TestTransport -> Assertion
13651219testKillRemote TestTransport{..} = do
13661220 node1 <- newLocalNode testTransport initRemoteTable
13671221 node2 <- newLocalNode testTransport initRemoteTable
1222+ done <- newEmptyMVar
13681223
13691224 pid <- forkProcess node1 $ do
13701225 liftIO $ threadDelay 1000000
@@ -1373,17 +1228,11 @@ testKillRemote TestTransport{..} = do
13731228 ref <- monitor pid
13741229 us <- getSelfPid
13751230 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"
1231+ ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1232+ True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1233+ liftIO $ putMVar done ()
1234+
1235+ takeMVar done
13871236
13881237testCatchesExit :: TestTransport -> Assertion
13891238testCatchesExit TestTransport{..} = do
@@ -1409,10 +1258,7 @@ testHandleMessageIf TestTransport{..} = do
14091258 self <- getSelfPid
14101259 send self (5 :: Integer, 10 :: Integer)
14111260 msg <- receiveWait [ matchMessage return ]
1412− handleMessageIf msg
1413− (\() -> True)
1414− (\() -> die "whoops") >>= maybe (return ())
1415− (const $ die "Expected Mismatch")
1261+ Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
14161262 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
14171263 (\input -> liftIO $ putMVar done input)
14181264 return ()
@@ -1457,11 +1303,8 @@ testDie TestTransport{..} = do
14571303 (die ("foobar", 123 :: Int))
14581304 `catchExit` \_from reason -> do
14591305 -- TODO: should verify that 'from' has the right value
1460− let res = reason == ("foobar", 123 :: Int)
1306+ True <- return $ reason == ("foobar", 123 :: Int)
14611307 liftIO $ putMVar done ()
1462− if res
1463− then return ()
1464− else die "Something went horribly wrong"
14651308
14661309 takeMVar done
14671310
@@ -1475,11 +1318,8 @@ testPrettyExit TestTransport{..} = do
14751318 `catch` \ex@(ProcessExitException from _) ->
14761319 let expected = "exit-from=" ++ (show from)
14771320 in do
1478− let res = (show ex) == expected
1321+ True <- return $ (show ex) == expected
14791322 liftIO $ putMVar done ()
1480− if res
1481− then return ()
1482− else die "Something went horribly wrong"
14831323
14841324 takeMVar done
14851325
@@ -1495,26 +1335,17 @@ testExitLocal TestTransport{..} = do
14951335 pid <- forkProcess localNode $ do
14961336 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
14971337 -- TODO: should verify that 'from' has the right value
1498− res <- return $ reason == "TestExit"
1338+ True <- return $ reason == "TestExit"
14991339 liftIO $ putMVar supervisedDone ()
1500− if res
1501− then return ()
1502− else die "Something went horribly wrong"
15031340
15041341 runProcess localNode $ do
15051342 liftIO $ takeMVar handlerSetUp
15061343 ref <- monitor pid
15071344 exit pid "TestExit"
15081345 -- 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"
1346+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1347+ True <- return $ ref == ref' && pid == pid'
1348+ liftIO $ putMVar supervisorDone ()
15181349
15191350 takeMVar supervisedDone
15201351 takeMVar supervisorDone
@@ -1530,98 +1361,19 @@ testExitRemote TestTransport{..} = do
15301361 (receiveWait [] :: Process ()) -- block forever
15311362 `catchExit` \_from reason -> do
15321363 -- TODO: should verify that 'from' has the right value
1533− res <- return $ reason == "TestExit"
1364+ True <- return $ reason == "TestExit"
15341365 liftIO $ putMVar supervisedDone ()
1535− if res
1536− then return ()
1537− else die "Something went horribly wrong"
15381366
15391367 runProcess node2 $ do
15401368 ref <- monitor pid
15411369 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"
1370+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1371+ True <- return $ ref == ref' && pid == pid'
1372+ liftIO $ putMVar supervisorDone ()
15511373
15521374 takeMVar supervisedDone
15531375 takeMVar supervisorDone
15541376
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−
16251377testUnsafeSend :: TestTransport -> Assertion
16261378testUnsafeSend TestTransport{..} = do
16271379 serverAddr <- newEmptyMVar
@@ -1637,7 +1389,8 @@ testUnsafeSend TestTransport{..} = do
16371389 void $ forkProcess localNode $ do
16381390 serverPid <- liftIO $ takeMVar serverAddr
16391391 getSelfPid >>= unsafeSend serverPid
1640− expect >>= liftIO . putMVar clientDone
1392+ () <- expect
1393+ liftIO $ putMVar clientDone ()
16411394
16421395 takeMVar clientDone
16431396
@@ -1656,7 +1409,8 @@ testUnsafeUSend TestTransport{..} = do
16561409 void $ forkProcess localNode $ do
16571410 serverPid <- liftIO $ takeMVar serverAddr
16581411 getSelfPid >>= unsafeUSend serverPid
1659− expect >>= liftIO . putMVar clientDone
1412+ () <- expect
1413+ liftIO $ putMVar clientDone ()
16601414
16611415 takeMVar clientDone
16621416
@@ -1667,7 +1421,8 @@ testUnsafeNSend TestTransport{..} = do
16671421 localNode <- newLocalNode testTransport initRemoteTable
16681422
16691423 pid <- forkProcess localNode $ do
1670− expect >>= liftIO . putMVar clientDone
1424+ () <- expect
1425+ liftIO $ putMVar clientDone ()
16711426
16721427 void $ runProcess localNode $ do
16731428 register "foobar" pid
@@ -1685,7 +1440,8 @@ testUnsafeNSendRemote TestTransport{..} = do
16851440 _ <- forkProcess localNode1 $ do
16861441 getSelfPid >>= register "foobar"
16871442 liftIO $ putMVar clientDone ()
1688− expect >>= liftIO . putMVar clientDone
1443+ () <- expect
1444+ liftIO $ putMVar clientDone ()
16891445
16901446 takeMVar clientDone
16911447 void $ runProcess localNode2 $ do
@@ -1709,7 +1465,7 @@ testUnsafeSendChan TestTransport{..} = do
17091465 serverPid <- liftIO $ takeMVar serverAddr
17101466 (sp, rp) <- newChan
17111467 unsafeSend serverPid sp
1712− receiveChan rp :: Process ()
1468+ () <- receiveChan rp
17131469 liftIO $ putMVar clientDone ()
17141470
17151471 takeMVar clientDone
@@ -1723,8 +1479,8 @@ testCallLocal TestTransport{..} = do
17231479 runProcess node $ do
17241480 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
17251481 liftIO $ putMVar result r
1726−
1727− takeMVar result >>= assertBool "Expected 'True'"
1482+ True <- takeMVar result
1483+ return ()
17281484
17291485 -- Testing that when callLocal is interrupted, the worker is interrupted.
17301486 ibox <- newIORef False
@@ -1741,9 +1497,10 @@ testCallLocal TestTransport{..} = do
17411497 (send keeper ())
17421498 caller <- expect
17431499 exit caller "test"
1744− expect :: Process ()
1745−
1746− readIORef ibox >>= assertBool "Expected 'True'"
1500+ () <- expect
1501+ return ()
1502+ True <- readIORef ibox
1503+ return ()
17471504
17481505 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
17491506 ibox2 <- newIORef False
@@ -1752,8 +1509,8 @@ testCallLocal TestTransport{..} = do
17521509 liftIO $ writeIORef ibox2 $ case r of
17531510 Left (ErrorCall "e") -> True
17541511 _ -> False
1755−
1756− readIORef ibox >>= assertBool "Expected 'True'"
1512+ True <- readIORef ibox
1513+ return ()
17571514
17581515 -- Test that caller waits for the worker in correct situation
17591516 ibox3 <- newIORef False
@@ -1770,8 +1527,8 @@ testCallLocal TestTransport{..} = do
17701527 liftIO $ putMVar result3 =<< readIORef ibox3
17711528 worker <- expect
17721529 send worker ()
1773−
1774− takeMVar result3 >>= assertBool "Expected 'True'"
1530+ True <- takeMVar result3
1531+ return ()
17751532
17761533 -- Test that caller waits for the worker in case when caller gets an exception
17771534 ibox4 <- newIORef False
@@ -1787,10 +1544,14 @@ testCallLocal TestTransport{..} = do
17871544 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
17881545 caller <- expect
17891546 exit caller "hi!"
1790−
1791− takeMVar result4 >>= assertBool "Expected 'True'"
1547+ True <- takeMVar result4
1548+ return ()
17921549 -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
17931550
1551+
1552+
1553+
1554+
17941555tests :: TestTransport -> IO [Test]
17951556tests testtrans = return [
17961557 testGroup "Basic features" [
@@ -1814,7 +1575,6 @@ tests testtrans = return [
18141575 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
18151576 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
18161577 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817− , testCase "ChanLifecycle" (testChanLifecycle testtrans)
18181578 , testCase "KillLocal" (testKillLocal testtrans)
18191579 , testCase "KillRemote" (testKillRemote testtrans)
18201580 , testCase "Die" (testDie testtrans)
@@ -1824,7 +1584,6 @@ tests testtrans = return [
18241584 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
18251585 , testCase "ExitLocal" (testExitLocal testtrans)
18261586 , testCase "ExitRemote" (testExitRemote testtrans)
1827− , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
18281587 , testCase "TextCallLocal" (testCallLocal testtrans)
18291588 -- Unsafe Primitives
18301589 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1877,3 +1636,17 @@ tests testtrans = return [
18771636 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
18781637 ]
18791638 ]
1639+
1640+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1641+syncBreakConnection breakConnection nid0 nid1 = do
1642+ m <- newEmptyMVar
1643+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1644+ runProcess nid0 $ do
1645+ them <- liftIO $ takeMVar m
1646+ pinger <- spawnLocal $ forever $ send them ()
1647+ _ <- monitorNode (localNodeId nid1)
1648+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1649+ (nodeAddress $ localNodeId nid1)
1650+ NodeMonitorNotification _ _ _ <- expect
1651+ kill pinger "finished"
1652+ return ()