@@ -9,7 +9,6 @@ import Network.Transport.Test (TestTransport(..))
99import Data.Binary (Binary(..))
1010import Data.Typeable (Typeable)
1111import Data.Foldable (forM_)
12−import Data.Function (fix)
1312import Data.IORef
1413 ( readIORef
1514 , writeIORef
@@ -25,32 +24,24 @@ import Control.Concurrent.MVar
2524 )
2625import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
2726import Control.Exception (SomeException, throwIO, ErrorCall(..))
28−import Control.Monad.Catch (try, catch, finally, mask, onException)
29−import Control.Applicative ((<|>))
27+import qualified Control.Exception as Ex (catch)
28+import Control.Applicative ((<$>), (<*>), pure, (<|>))
3029import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
31−import Control.Distributed.Process hiding
32− ( try
33− , catch
34− , finally
35− , mask
36− , onException
37− )
30+import Control.Distributed.Process
3831import Control.Distributed.Process.Internal.Types
39− ( LocalNode(localEndPoint)
32+ ( NodeId(nodeAddress)
33+ , LocalNode(localEndPoint)
4034 , ProcessExitException(..)
4135 , nullProcessId
4236 , createUnencodedMessage
4337 )
4438import 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)
4839import Control.Distributed.Process.Serializable (Serializable)
49−import Data.Maybe (isNothing, isJust)
50−import Test.HUnit (Assertion, assertBool, assertFailure)
40+
41+import Test.HUnit (Assertion, assertFailure)
5142import Test.Framework (Test, testGroup)
5243import Test.Framework.Providers.HUnit (testCase)
53−import Control.Rematch hiding (match, isNothing, isJust)
44+import Control.Rematch hiding (match)
5445import Control.Rematch.Run (Match(..))
5546
5647newtype Ping = Ping ProcessId
@@ -73,7 +64,7 @@ expectThat a matcher = case res of
7364forkTry :: IO () -> IO ThreadId
7465forkTry p = do
7566 tid <- myThreadId
76− forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
67+ forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
7768
7869-- | The ping server from the paper
7970ping :: Process ()
@@ -83,46 +74,12 @@ ping = do
8374 send partner (Ping self)
8475 ping
8576
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−
9477-- | Quick and dirty synchronous version of whereisRemoteAsync
9578whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
9679whereisRemote nid string = do
9780 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 ()
81+ WhereIsReply _ mPid <- expect
82+ return mPid
12683
12784data Add = Add ProcessId Double Double deriving (Typeable)
12885data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -197,18 +154,12 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
197154 unmonitor ref
198155 liftIO $ putMVar done ()
199156 (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− ]
157+ ProcessMonitorNotification ref' pid reason' <- expect
158+ True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
159+ liftIO $ putMVar done ()
208160 )
209161 (\(ProcessLinkException pid reason') -> do
210− (liftIO $ assertBool "link exception unmatched" $
211− pid == theirAddr && not mOrL && not un && reason == reason')
162+ True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
212163 liftIO $ putMVar done ()
213164 )
214165
@@ -239,10 +190,8 @@ testPing TestTransport{..} = do
239190 pid <- getSelfPid
240191 replicateM_ numPings $ do
241192 send pingServer (Pong pid)
242− p <- expectTimeout 3000000
243− case p of
244− Just (Ping _) -> return ()
245− Nothing -> die "Failed to receive Ping"
193+ Ping _ <- expect
194+ return ()
246195
247196 putMVar clientDone ()
248197
@@ -329,7 +278,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
329278 runProcess localNode $ do
330279 monitor theirAddr
331280 -- wait for the process to die
332− expect :: Process ProcessMonitorNotification
281+ ProcessMonitorNotification _ _ _ <- expect
333282 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
334283
335284 takeMVar done
@@ -403,17 +352,14 @@ testMath TestTransport{..} = do
403352 runProcess localNode $ do
404353 pid <- getSelfPid
405354 send mathServer (Add pid 1 2)
406− three <- expect :: Process Double
355+ 3 <- expect :: Process Double
407356 send mathServer (Divide pid 8 2)
408− four <- expect :: Process Double
357+ 4 <- expect :: Process Double
409358 send mathServer (Divide pid 8 0)
410− divByZ <- expect
411− liftIO $ putMVar clientDone (three, four, divByZ)
359+ DivByZero <- expect
360+ liftIO $ putMVar clientDone ()
412361
413− res <- takeMVar clientDone
414− case res of
415− (3, 4, DivByZero) -> return ()
416− _ -> error $ "Something went horribly wrong"
362+ takeMVar clientDone
417363
418364-- | Send first message (i.e. connect) to an already terminated process
419365-- (without monitoring); then send another message to a second process on
@@ -441,9 +387,11 @@ testSendToTerminated TestTransport{..} = do
441387 pid <- getSelfPid
442388 send server1 "Hi"
443389 send server2 (Pong pid)
444− expectPing clientDone
390+ Ping pid' <- expect
391+ True <- return $ pid' == server2
392+ liftIO $ putMVar clientDone ()
445393
446− verifyClient "Expected Ping from server" clientDone
394+ takeMVar clientDone
447395
448396-- | Test (non-zero) timeout
449397testTimeout :: TestTransport -> Assertion
@@ -452,24 +400,26 @@ testTimeout TestTransport{..} = do
452400 done <- newEmptyMVar
453401
454402 runProcess localNode $ do
455− res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
456− liftIO $ putMVar done $ res == Nothing
403+ Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
404+ liftIO $ putMVar done ()
457405
458− verifyClient "Expected receiveTimeout to timeout..." done
406+ takeMVar done
459407
460408-- | Test zero timeout
461409testTimeout0 :: TestTransport -> Assertion
462410testTimeout0 TestTransport{..} = do
463411 serverAddr <- newEmptyMVar
464412 clientDone <- newEmptyMVar
413+ messagesSent <- newEmptyMVar
465414
466415 forkIO $ do
467416 localNode <- newLocalNode testTransport initRemoteTable
468417 addr <- forkProcess localNode $ do
418+ liftIO $ readMVar messagesSent >> threadDelay 1000000
469419 -- Variation on the venerable ping server which uses a zero timeout
470− partner <- fix $ \loop ->
471− receiveTimeout 0 [match (\(Pong partner) -> return partner)]
472− >>= maybe (liftIO (threadDelay 100000) >> loop) return
420+ -- Since we wait for all messages to be sent before doing this receive,
421+ -- we should nevertheless find the right message immediately
422+ Just partner <- receiveTimeout 0 [match (\(Pong partner) -> return partner)]
473423 self <- getSelfPid
474424 send partner (Ping self)
475425 putMVar serverAddr addr
@@ -483,9 +433,11 @@ testTimeout0 TestTransport{..} = do
483433 -- is not interested in, and then a single message that it wants
484434 replicateM_ 10000 $ send server "Irrelevant message"
485435 send server (Pong pid)
486− expectPing clientDone
436+ liftIO $ putMVar messagesSent ()
437+ Ping _ <- expect
438+ liftIO $ putMVar clientDone ()
487439
488− verifyClient "Expected Ping from server" clientDone
440+ takeMVar clientDone
489441
490442-- | Test typed channels
491443testTypedChannels :: TestTransport -> Assertion
@@ -508,10 +460,10 @@ testTypedChannels TestTransport{..} = do
508460 runProcess localNode $ do
509461 (clientSendPort, rport) <- newChan
510462 sendChan serverSendPort (clientSendPort, 5)
511− ch <- receiveChan rport
512− liftIO $ putMVar clientDone $ ch == False
463+ False <- receiveChan rport
464+ liftIO $ putMVar clientDone ()
513465
514− verifyClient "Expected channel to send 'False'" clientDone
466+ takeMVar clientDone
515467
516468-- | Test merging receive ports
517469testMergeChannels :: TestTransport -> Assertion
@@ -534,8 +486,9 @@ testMergeChannels TestTransport{..} = do
534486 rs <- mapM charChannel "abc"
535487 m <- mergePorts biased rs
536488 xs <- replicateM 9 $ receiveChan m
537− liftIO $ putMVar done $ xs == expected
538− verifyClient "Expected single layer merge to match expected ordering" done
489+ True <- return $ xs == expected
490+ liftIO $ putMVar done ()
491+ takeMVar done
539492
540493 -- Two layers of merging
541494 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -546,8 +499,9 @@ testMergeChannels TestTransport{..} = do
546499 ms <- mapM (mergePorts biasedInner) rss
547500 m <- mergePorts biasedOuter ms
548501 xs <- replicateM (9 * 3) $ receiveChan m
549− liftIO $ putMVar done $ xs == expected
550− verifyClient "Expected nested channels to match expeted ordering" done
502+ True <- return $ xs == expected
503+ liftIO $ putMVar done ()
504+ takeMVar done
551505
552506 -- Test that if no messages are (immediately) available, the scheduler makes no difference
553507 testBlocked :: LocalNode -> Bool -> IO ()
@@ -556,45 +510,43 @@ testMergeChannels TestTransport{..} = do
556510 done <- newEmptyMVar
557511
558512 forkProcess localNode $ do
559− ss <- liftIO $ mapM readMVar vs
560− case ss of
561− [sa, sb, sc] ->
562− mapM_ ((>> pause 10000) . uncurry sendChan)
563− [ -- a, b, c
564− (sa, 'a')
565− , (sb, 'b')
566− , (sc, 'c')
567− -- a, c, b
568− , (sa, 'a')
569− , (sc, 'c')
570− , (sb, 'b')
571− -- b, a, c
572− , (sb, 'b')
573− , (sa, 'a')
574− , (sc, 'c')
575− -- b, c, a
576− , (sb, 'b')
577− , (sc, 'c')
578− , (sa, 'a')
579− -- c, a, b
580− , (sc, 'c')
581− , (sa, 'a')
582− , (sb, 'b')
583− -- c, b, a
584− , (sc, 'c')
585− , (sb, 'b')
586− , (sa, 'a')
587− ]
588− _ -> die "Something went horribly wrong"
513+ [sa, sb, sc] <- liftIO $ mapM readMVar vs
514+ mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
515+ [ -- a, b, c
516+ (sa, 'a')
517+ , (sb, 'b')
518+ , (sc, 'c')
519+ -- a, c, b
520+ , (sa, 'a')
521+ , (sc, 'c')
522+ , (sb, 'b')
523+ -- b, a, c
524+ , (sb, 'b')
525+ , (sa, 'a')
526+ , (sc, 'c')
527+ -- b, c, a
528+ , (sb, 'b')
529+ , (sc, 'c')
530+ , (sa, 'a')
531+ -- c, a, b
532+ , (sc, 'c')
533+ , (sa, 'a')
534+ , (sb, 'b')
535+ -- c, b, a
536+ , (sc, 'c')
537+ , (sb, 'b')
538+ , (sa, 'a')
539+ ]
589540
590541 forkProcess localNode $ do
591542 (ss, rs) <- unzip <$> replicateM 3 newChan
592543 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
593544 m <- mergePorts biased rs
594545 xs <- replicateM (6 * 3) $ receiveChan m
595− liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
546+ True <- return $ xs == "abcacbbacbcacabcba"
547+ liftIO $ putMVar done ()
596548
597− verifyClient "Expected merged ports to match expected ordering" done
549+ takeMVar done
598550
599551 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
600552 mergePorts True = mergePortsBiased
@@ -610,11 +562,19 @@ testMergeChannels TestTransport{..} = do
610562testTerminate :: TestTransport -> Assertion
611563testTerminate TestTransport{..} = do
612564 localNode <- newLocalNode testTransport initRemoteTable
565+ done <- newEmptyMVar
566+
567+ pid <- forkProcess localNode $ do
568+ liftIO $ threadDelay 100000
569+ terminate
570+
613571 runProcess localNode $ do
614− e <- try terminate :: Process (Either ProcessTerminationException ())
615− if either show show e == show ProcessTerminationException
616− then return ()
617− else die "Unexpected result from terminate"
572+ ref <- monitor pid
573+ ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
574+ True <- return $ ref == ref' && pid == pid' && ex == show ProcessTerminationException
575+ liftIO $ putMVar done ()
576+
577+ takeMVar done
618578
619579testMonitorNode :: TestTransport -> Assertion
620580testMonitorNode TestTransport{..} = do
@@ -625,12 +585,11 @@ testMonitorNode TestTransport{..} = do
625585
626586 runProcess node2 $ do
627587 ref <- monitorNode (localNodeId node1)
628− receiveWait [
629− match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
630− return $ ref == ref' && nid == localNodeId node1)
631− ] >>= liftIO . putMVar done
588+ NodeMonitorNotification ref' nid DiedDisconnect <- expect
589+ True <- return $ ref == ref' && nid == localNodeId node1
590+ liftIO $ putMVar done ()
632591
633− verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
592+ takeMVar done
634593
635594testMonitorLiveNode :: TestTransport -> Assertion
636595testMonitorLiveNode TestTransport{..} = do
@@ -645,16 +604,15 @@ testMonitorLiveNode TestTransport{..} = do
645604 liftIO $ putMVar ready ()
646605 liftIO $ takeMVar readyr
647606 send p ()
648− receiveWait [
649− match (\(NodeMonitorNotification ref' nid _) ->
650− (return $ ref == ref' && nid == localNodeId node1))
651− ] >>= liftIO . putMVar done
607+ NodeMonitorNotification ref' nid _ <- expect
608+ True <- return $ ref == ref' && nid == localNodeId node1
609+ liftIO $ putMVar done ()
652610
653611 takeMVar ready
654612 closeLocalNode node1
655613 putMVar readyr ()
656614
657− verifyClient "Expected NodeMonitorNotification for LIVE node" done
615+ takeMVar done
658616
659617testMonitorChannel :: TestTransport -> Assertion
660618testMonitorChannel TestTransport{..} = do
@@ -664,20 +622,18 @@ testMonitorChannel TestTransport{..} = do
664622 pid <- forkProcess node1 $ do
665623 sport <- expect :: Process (SendPort ())
666624 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
625+ PortMonitorNotification ref' port' reason <- expect
626+ -- reason might be DiedUnknownId if the receive port is GCed before the
627+ -- monitor is established (TODO: not sure that this is reasonable)
628+ return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
629+ liftIO $ putMVar gotNotification ()
674630
675631 runProcess node2 $ do
676632 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
677633 send pid sport
678634 liftIO $ threadDelay 100000
679635
680− verifyClient "Expected PortMonitorNotification" gotNotification
636+ takeMVar gotNotification
681637
682638testRegistry :: TestTransport -> Assertion
683639testRegistry TestTransport{..} = do
@@ -689,28 +645,20 @@ testRegistry TestTransport{..} = do
689645
690646 runProcess node $ do
691647 register "ping" pingServer
692− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
648+ Just pid <- whereis "ping"
649+ True <- return $ pingServer == pid
693650 us <- getSelfPid
694651 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
652+ Ping pid' <- expect
653+ True <- return $ pingServer == pid'
654+ Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
655+ Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
656+ True <- return $ x == pingServer
657+ Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
701658 liftIO $ putMVar done ()
702659
703660 takeMVar done
704661
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−
714662testRegistryRemoteProcess :: TestTransport -> Assertion
715663testRegistryRemoteProcess TestTransport{..} = do
716664 node1 <- newLocalNode testTransport initRemoteTable
@@ -721,13 +669,13 @@ testRegistryRemoteProcess TestTransport{..} = do
721669
722670 runProcess node2 $ do
723671 register "ping" pingServer
724− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
672+ Just pid <- whereis "ping"
673+ True <- return $ pingServer == pid
725674 us <- getSelfPid
726675 nsend "ping" (Pong us)
727− receiveWait [
728− matchIf (\(Ping pid') -> pingServer == pid')
729− (const $ liftIO $ putMVar done ())
730− ]
676+ Ping pid' <- expect
677+ True <- return $ pingServer == pid'
678+ liftIO $ putMVar done ()
731679
732680 takeMVar done
733681
@@ -735,6 +683,7 @@ testRemoteRegistry :: TestTransport -> Assertion
735683testRemoteRegistry TestTransport{..} = do
736684 node1 <- newLocalNode testTransport initRemoteTable
737685 node2 <- newLocalNode testTransport initRemoteTable
686+ done <- newEmptyMVar
738687
739688 pingServer <- forkProcess node1 ping
740689 deadProcess <- forkProcess node1 (return ())
@@ -747,34 +696,32 @@ testRemoteRegistry TestTransport{..} = do
747696 "ping" == label' && pid == pingServer)
748697 (\(RegisterReply _ _ _) -> return ()) ]
749698
750− pid <- verifyWhereIsRemote nid1 "ping"
751− liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752−
699+ Just pid <- whereisRemote nid1 "ping"
700+ True <- return $ pingServer == pid
753701 us <- getSelfPid
754702 nsendRemote nid1 "ping" (Pong us)
755− receiveWait [
756− match (\(Ping pid') -> return $ pingServer == pid')
757− ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
703+ Ping pid' <- expect
704+ True <- return $ pingServer == pid'
758705
759706 -- test that if process was not registered Nothing is returned
760707 -- in owner field.
761708 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−
709+ receiveWait [
710+ matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
711+ (\(RegisterReply _ _ _) -> return ()) ]
766712 registerRemoteAsync nid1 "ping" deadProcess
767713 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−
714+ matchIf (\(RegisterReply label' False (Just pid)) ->
715+ "ping" == label' && pid == pingServer)
716+ (\(RegisterReply _ _ _) -> return ()) ]
773717 unregisterRemoteAsync nid1 "dead"
774718 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"
719+ matchIf (\(RegisterReply label' False Nothing) ->
720+ "dead" == label' && pid == pingServer)
721+ (\(RegisterReply _ _ _) -> return ()) ]
722+ liftIO $ putMVar done ()
723+
724+ takeMVar done
778725
779726testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
780727testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -790,15 +737,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
790737 receiveWait [
791738 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
792739 (\(RegisterReply _ _ _) -> return ()) ]
793− pid <- verifyWhereIsRemote nid1 "ping"
794− liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
740+ Just pid <- whereisRemote nid1 "ping"
741+ True <- return $ pingServer == pid
795742 us <- getSelfPid
796743 nsendRemote nid1 "ping" (Pong us)
797− receiveWait [
798− match (\(Ping pid') -> return $ pingServer == pid')
799− ] >>= liftIO . putMVar done
744+ Ping pid' <- expect
745+ True <- return $ pingServer == pid'
746+ liftIO $ putMVar done ()
800747
801− verifyClient "Expected Ping with ping server's ProcessId" done
748+ takeMVar done
802749
803750testSpawnLocal :: TestTransport -> Assertion
804751testSpawnLocal TestTransport{..} = do
@@ -812,14 +759,15 @@ testSpawnLocal TestTransport{..} = do
812759 sport <- expect
813760 sendChan sport (1234 :: Int)
814761
815− sport <- spawnChannelLocal $
816− \rport -> (receiveChan rport :: Process Int) >>= send us
762+ sport <- spawnChannelLocal $ \rport -> do
763+ (1234 :: Int) <- receiveChan rport
764+ send us ()
817765
818766 send pid sport
819− expect >>= liftIO . putMVar done
767+ () <- expect
768+ liftIO $ putMVar done ()
820769
821− res <- takeMVar done
822− assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
770+ takeMVar done
823771
824772testSpawnAsyncStrictness :: TestTransport -> Assertion
825773testSpawnAsyncStrictness TestTransport{..} = do
@@ -848,9 +796,8 @@ testReconnect TestTransport{..} = do
848796 liftIO $ putMVar processA us
849797 msg1 <- expect
850798 msg2 <- expect
851− liftIO $ do
852− assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
853− putMVar sendTestOk ()
799+ True <- return $ msg1 == "message 1" && msg2 == "message 3"
800+ liftIO $ putMVar sendTestOk ()
854801
855802 forkProcess node2 $ do
856803 {-
@@ -883,7 +830,7 @@ testReconnect TestTransport{..} = do
883830 matchIf (\(RegisterReply label' _ _) -> "a" == label')
884831 (\(RegisterReply _ _ _) -> return ()) ]
885832
886− _ <- whereisRemote nid1 "a"
833+ Just _ <- whereisRemote nid1 "a"
887834
888835
889836 -- Simulate network failure
@@ -902,10 +849,9 @@ testReconnect TestTransport{..} = do
902849 (\(RegisterReply _ _ _) -> return ()) ]
903850
904851 -- 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"
852+ Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
853+ Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
854+ Just _ <- whereisRemote nid1 "c"
909855
910856 liftIO $ putMVar registerTestOk ()
911857
@@ -946,19 +892,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
946892 isSorted _ = True
947893 -- The list can't be null since there are no failures after sending
948894 -- the last message.
949− liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
895+ True <- return $ isSorted msgs && not (null msgs)
896+ liftIO $ putMVar usendTestOk ()
950897
951898 forkProcess node2 $ do
952899 them <- liftIO $ readMVar processA
953900 getSelfPid >>= send them
954− expect :: Process ()
901+ () <- expect
955902 forM_ [1..numMessages] $ \i -> do
956903 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
957904 usendPrim them i
958905 liftIO (threadDelay 30000)
959906
960− res <- takeMVar usendTestOk
961− assertBool "Unexpected failure after sending last msg" res
907+ takeMVar usendTestOk
962908
963909-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
964910-- in between
@@ -984,17 +930,14 @@ testMatchAny TestTransport{..} = do
984930 runProcess localNode $ do
985931 pid <- getSelfPid
986932 send mathServer (Add pid 1 2)
987− three <- expect :: Process Double
933+ 3 <- expect :: Process Double
988934 send mathServer (Divide pid 8 2)
989− four <- expect :: Process Double
935+ 4 <- expect :: Process Double
990936 send mathServer (Divide pid 8 0)
991− divByZ <- expect
992− liftIO $ putMVar clientDone (three, four, divByZ)
937+ DivByZero <- expect
938+ liftIO $ putMVar clientDone ()
993939
994− res <- takeMVar clientDone
995− case res of
996− (3, 4, DivByZero) -> return ()
997− _ -> error "Unexpected result"
940+ takeMVar clientDone
998941
999942-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
1000943-- in between, however we block 'Divide' requests ....
@@ -1021,13 +964,12 @@ testMatchAnyHandle TestTransport{..} = do
1021964 runProcess localNode $ do
1022965 pid <- getSelfPid
1023966 send mathServer (Add pid 1 2)
1024− three <- expect :: Process Double
967+ 3 <- expect :: Process Double
1025968 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
969+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
970+ liftIO $ putMVar clientDone ()
1030971
972+ takeMVar clientDone
1031973 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1032974 maybeForward s msg =
1033975 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -1055,10 +997,8 @@ testMatchAnyNoHandle TestTransport{..} = do
1055997 Just _ -> die "NONSENSE")
1056998 ]
1057999 -- 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 ()
1000+ Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1001+ liftIO $ putMVar serverDone ()
10621002 putMVar addr server
10631003
10641004 -- Client
@@ -1101,21 +1041,14 @@ testMatchAnyIf TestTransport{..} = do
11011041 runProcess localNode $ do
11021042 pid <- getSelfPid
11031043 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−
1044+ "foo" <- expect
11101045 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'
1046+ "baz" <- expect
1047+ send server (pid, "bar")
1048+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1049+ liftIO $ putMVar clientDone ()
11181050
1051+ takeMVar clientDone
11191052 where tryHandleMessage :: Message -> Process (Maybe ())
11201053 tryHandleMessage msg =
11211054 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1148,19 +1081,17 @@ testMatchMessageWithUnwrap TestTransport{..} = do
11481081 runProcess localNode $ do
11491082 pid <- getSelfPid
11501083 send server (pid, wrapMessage ("foo" :: String))
1151− foo <- expect
1084+ "foo" <- expect
11521085 send server (pid, wrapMessage ("baz" :: String))
1153− baz <- expect
1154− liftIO $ putMVar clientDone (foo, baz)
1086+ "baz" <- expect
1087+ liftIO $ putMVar clientDone ()
11551088
1156− res <- takeMVar clientDone
1157− assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1089+ takeMVar clientDone
11581090
11591091-- Test 'receiveChanTimeout'
11601092testReceiveChanTimeout :: TestTransport -> Assertion
11611093testReceiveChanTimeout TestTransport{..} = do
11621094 done <- newEmptyMVar
1163− mvSender <- newEmptyMVar
11641095 sendPort <- newEmptyMVar
11651096
11661097 forkTry $ do
@@ -1170,32 +1101,18 @@ testReceiveChanTimeout TestTransport{..} = do
11701101 (sp, rp) <- newChan :: Process (SendPort Bool, ReceivePort Bool)
11711102 liftIO $ putMVar sendPort sp
11721103
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 ()
1179−
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
1104+ -- Wait for a message with a delay. No message arrives, we should get Nothing after 1 second
1105+ Nothing <- receiveChanTimeout 1000000 rp
11841106
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")
1107+ -- Wait for a message with a delay again. Now a message arrives after 0.5 seconds
1108+ Just True <- receiveChanTimeout 1000000 rp
11881109
1189− -- Let the sender know that it can send a message.
1190− liftIO $ putMVar mvSender ()
1110+ -- Wait for a message with zero timeout: non-blocking check. No message is available, we get Nothing
1111+ Nothing <- receiveChanTimeout 0 rp
11911112
11921113 -- 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
1114+ liftIO $ threadDelay 1000000
1115+ Just False <- receiveChanTimeout 0 rp
11991116
12001117 liftIO $ putMVar done ()
12011118
@@ -1204,11 +1121,10 @@ testReceiveChanTimeout TestTransport{..} = do
12041121 runProcess localNode $ do
12051122 sp <- liftIO $ readMVar sendPort
12061123
1207− liftIO $ takeMVar mvSender
1208− liftIO $ threadDelay 100000
1124+ liftIO $ threadDelay 1500000
12091125 sendChan sp True
12101126
1211− liftIO $ takeMVar mvSender
1127+ liftIO $ threadDelay 500000
12121128 sendChan sp False
12131129
12141130 takeMVar done
@@ -1231,8 +1147,8 @@ testReceiveChanFeatures TestTransport{..} = do
12311147
12321148 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
12331149
1234− receiveChan rp1 >>= liftIO . assertBool "Expected True"
1235− receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1150+ True <- receiveChan rp1
1151+ False <- receiveChan rp1
12361152
12371153 -- Test Applicative instance
12381154
@@ -1241,7 +1157,7 @@ testReceiveChanFeatures TestTransport{..} = do
12411157
12421158 let rp2 = pure (+) <*> rpInt <*> rpInt
12431159
1244− receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1160+ 7 <- receiveChan rp2
12451161
12461162 -- Test Alternative instance
12471163
@@ -1250,8 +1166,8 @@ testReceiveChanFeatures TestTransport{..} = do
12501166
12511167 let rp3 = (even <$> rpInt) <|> rpBool
12521168
1253− receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1254− receiveChan rp3 >>= liftIO . assertBool "Expected True"
1169+ False <- receiveChan rp3
1170+ True <- receiveChan rp3
12551171
12561172 -- Test Monad instance
12571173
@@ -1265,86 +1181,17 @@ testReceiveChanFeatures TestTransport{..} = do
12651181 then rpInt
12661182 else return 7
12671183
1268− receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1269− receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1184+ 5 <- receiveChan rp4
1185+ 7 <- receiveChan rp4
12701186
12711187 liftIO $ putMVar done ()
12721188
12731189 takeMVar done
12741190
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−
13451191testKillLocal :: TestTransport -> Assertion
13461192testKillLocal TestTransport{..} = do
13471193 localNode <- newLocalNode testTransport initRemoteTable
1194+ done <- newEmptyMVar
13481195
13491196 pid <- forkProcess localNode $ do
13501197 liftIO $ threadDelay 1000000
@@ -1353,18 +1200,17 @@ testKillLocal TestTransport{..} = do
13531200 ref <- monitor pid
13541201 us <- getSelfPid
13551202 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"
1203+ ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1204+ True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1205+ liftIO $ putMVar done ()
1206+
1207+ takeMVar done
13631208
13641209testKillRemote :: TestTransport -> Assertion
13651210testKillRemote TestTransport{..} = do
13661211 node1 <- newLocalNode testTransport initRemoteTable
13671212 node2 <- newLocalNode testTransport initRemoteTable
1213+ done <- newEmptyMVar
13681214
13691215 pid <- forkProcess node1 $ do
13701216 liftIO $ threadDelay 1000000
@@ -1373,17 +1219,11 @@ testKillRemote TestTransport{..} = do
13731219 ref <- monitor pid
13741220 us <- getSelfPid
13751221 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"
1222+ ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1223+ True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1224+ liftIO $ putMVar done ()
1225+
1226+ takeMVar done
13871227
13881228testCatchesExit :: TestTransport -> Assertion
13891229testCatchesExit TestTransport{..} = do
@@ -1409,10 +1249,7 @@ testHandleMessageIf TestTransport{..} = do
14091249 self <- getSelfPid
14101250 send self (5 :: Integer, 10 :: Integer)
14111251 msg <- receiveWait [ matchMessage return ]
1412− handleMessageIf msg
1413− (\() -> True)
1414− (\() -> die "whoops") >>= maybe (return ())
1415− (const $ die "Expected Mismatch")
1252+ Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
14161253 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
14171254 (\input -> liftIO $ putMVar done input)
14181255 return ()
@@ -1457,11 +1294,8 @@ testDie TestTransport{..} = do
14571294 (die ("foobar", 123 :: Int))
14581295 `catchExit` \_from reason -> do
14591296 -- TODO: should verify that 'from' has the right value
1460− let res = reason == ("foobar", 123 :: Int)
1297+ True <- return $ reason == ("foobar", 123 :: Int)
14611298 liftIO $ putMVar done ()
1462− if res
1463− then return ()
1464− else die "Something went horribly wrong"
14651299
14661300 takeMVar done
14671301
@@ -1475,11 +1309,8 @@ testPrettyExit TestTransport{..} = do
14751309 `catch` \ex@(ProcessExitException from _) ->
14761310 let expected = "exit-from=" ++ (show from)
14771311 in do
1478− let res = (show ex) == expected
1312+ True <- return $ (show ex) == expected
14791313 liftIO $ putMVar done ()
1480− if res
1481− then return ()
1482− else die "Something went horribly wrong"
14831314
14841315 takeMVar done
14851316
@@ -1495,26 +1326,17 @@ testExitLocal TestTransport{..} = do
14951326 pid <- forkProcess localNode $ do
14961327 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
14971328 -- TODO: should verify that 'from' has the right value
1498− res <- return $ reason == "TestExit"
1329+ True <- return $ reason == "TestExit"
14991330 liftIO $ putMVar supervisedDone ()
1500− if res
1501− then return ()
1502− else die "Something went horribly wrong"
15031331
15041332 runProcess localNode $ do
15051333 liftIO $ takeMVar handlerSetUp
15061334 ref <- monitor pid
15071335 exit pid "TestExit"
15081336 -- 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"
1337+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1338+ True <- return $ ref == ref' && pid == pid'
1339+ liftIO $ putMVar supervisorDone ()
15181340
15191341 takeMVar supervisedDone
15201342 takeMVar supervisorDone
@@ -1530,98 +1352,19 @@ testExitRemote TestTransport{..} = do
15301352 (receiveWait [] :: Process ()) -- block forever
15311353 `catchExit` \_from reason -> do
15321354 -- TODO: should verify that 'from' has the right value
1533− res <- return $ reason == "TestExit"
1355+ True <- return $ reason == "TestExit"
15341356 liftIO $ putMVar supervisedDone ()
1535− if res
1536− then return ()
1537− else die "Something went horribly wrong"
15381357
15391358 runProcess node2 $ do
15401359 ref <- monitor pid
15411360 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"
1361+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1362+ True <- return $ ref == ref' && pid == pid'
1363+ liftIO $ putMVar supervisorDone ()
15511364
15521365 takeMVar supervisedDone
15531366 takeMVar supervisorDone
15541367
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−
16251368testUnsafeSend :: TestTransport -> Assertion
16261369testUnsafeSend TestTransport{..} = do
16271370 serverAddr <- newEmptyMVar
@@ -1637,26 +1380,8 @@ testUnsafeSend TestTransport{..} = do
16371380 void $ forkProcess localNode $ do
16381381 serverPid <- liftIO $ takeMVar serverAddr
16391382 getSelfPid >>= unsafeSend serverPid
1640− expect >>= liftIO . putMVar clientDone
1641−
1642− takeMVar clientDone
1643−
1644−testUnsafeUSend :: TestTransport -> Assertion
1645−testUnsafeUSend TestTransport{..} = do
1646− serverAddr <- newEmptyMVar
1647− clientDone <- newEmptyMVar
1648−
1649− localNode <- newLocalNode testTransport initRemoteTable
1650− void $ forkProcess localNode $ do
1651− self <- getSelfPid
1652− liftIO $ putMVar serverAddr self
1653− clientAddr <- expect
1654− unsafeUSend clientAddr ()
1655−
1656− void $ forkProcess localNode $ do
1657− serverPid <- liftIO $ takeMVar serverAddr
1658− getSelfPid >>= unsafeUSend serverPid
1659− expect >>= liftIO . putMVar clientDone
1383+ () <- expect
1384+ liftIO $ putMVar clientDone ()
16601385
16611386 takeMVar clientDone
16621387
@@ -1667,7 +1392,8 @@ testUnsafeNSend TestTransport{..} = do
16671392 localNode <- newLocalNode testTransport initRemoteTable
16681393
16691394 pid <- forkProcess localNode $ do
1670− expect >>= liftIO . putMVar clientDone
1395+ () <- expect
1396+ liftIO $ putMVar clientDone ()
16711397
16721398 void $ runProcess localNode $ do
16731399 register "foobar" pid
@@ -1675,24 +1401,6 @@ testUnsafeNSend TestTransport{..} = do
16751401
16761402 takeMVar clientDone
16771403
1678−testUnsafeNSendRemote :: TestTransport -> Assertion
1679−testUnsafeNSendRemote TestTransport{..} = do
1680− clientDone <- newEmptyMVar
1681−
1682− localNode1 <- newLocalNode testTransport initRemoteTable
1683− localNode2 <- newLocalNode testTransport initRemoteTable
1684−
1685− _ <- forkProcess localNode1 $ do
1686− getSelfPid >>= register "foobar"
1687− liftIO $ putMVar clientDone ()
1688− expect >>= liftIO . putMVar clientDone
1689−
1690− takeMVar clientDone
1691− void $ runProcess localNode2 $ do
1692− unsafeNSendRemote (localNodeId localNode1) "foobar" ()
1693−
1694− takeMVar clientDone
1695−
16961404testUnsafeSendChan :: TestTransport -> Assertion
16971405testUnsafeSendChan TestTransport{..} = do
16981406 serverAddr <- newEmptyMVar
@@ -1709,7 +1417,7 @@ testUnsafeSendChan TestTransport{..} = do
17091417 serverPid <- liftIO $ takeMVar serverAddr
17101418 (sp, rp) <- newChan
17111419 unsafeSend serverPid sp
1712− receiveChan rp :: Process ()
1420+ () <- receiveChan rp
17131421 liftIO $ putMVar clientDone ()
17141422
17151423 takeMVar clientDone
@@ -1723,8 +1431,8 @@ testCallLocal TestTransport{..} = do
17231431 runProcess node $ do
17241432 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
17251433 liftIO $ putMVar result r
1726−
1727− takeMVar result >>= assertBool "Expected 'True'"
1434+ True <- takeMVar result
1435+ return ()
17281436
17291437 -- Testing that when callLocal is interrupted, the worker is interrupted.
17301438 ibox <- newIORef False
@@ -1741,9 +1449,10 @@ testCallLocal TestTransport{..} = do
17411449 (send keeper ())
17421450 caller <- expect
17431451 exit caller "test"
1744− expect :: Process ()
1745−
1746− readIORef ibox >>= assertBool "Expected 'True'"
1452+ () <- expect
1453+ return ()
1454+ True <- readIORef ibox
1455+ return ()
17471456
17481457 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
17491458 ibox2 <- newIORef False
@@ -1752,8 +1461,8 @@ testCallLocal TestTransport{..} = do
17521461 liftIO $ writeIORef ibox2 $ case r of
17531462 Left (ErrorCall "e") -> True
17541463 _ -> False
1755−
1756− readIORef ibox >>= assertBool "Expected 'True'"
1464+ True <- readIORef ibox
1465+ return ()
17571466
17581467 -- Test that caller waits for the worker in correct situation
17591468 ibox3 <- newIORef False
@@ -1770,8 +1479,8 @@ testCallLocal TestTransport{..} = do
17701479 liftIO $ putMVar result3 =<< readIORef ibox3
17711480 worker <- expect
17721481 send worker ()
1773−
1774− takeMVar result3 >>= assertBool "Expected 'True'"
1482+ True <- takeMVar result3
1483+ return ()
17751484
17761485 -- Test that caller waits for the worker in case when caller gets an exception
17771486 ibox4 <- newIORef False
@@ -1787,10 +1496,14 @@ testCallLocal TestTransport{..} = do
17871496 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
17881497 caller <- expect
17891498 exit caller "hi!"
1790−
1791− takeMVar result4 >>= assertBool "Expected 'True'"
1499+ True <- takeMVar result4
1500+ return ()
17921501 -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
17931502
1503+
1504+
1505+
1506+
17941507tests :: TestTransport -> IO [Test]
17951508tests testtrans = return [
17961509 testGroup "Basic features" [
@@ -1800,7 +1513,9 @@ tests testtrans = return [
18001513 , testCase "Timeout0" (testTimeout0 testtrans)
18011514 , testCase "SendToTerminated" (testSendToTerminated testtrans)
18021515 , testCase "TypedChannnels" (testTypedChannels testtrans)
1516+ , testCase "MergeChannels" (testMergeChannels testtrans)
18031517 , testCase "Terminate" (testTerminate testtrans)
1518+ , testCase "Registry" (testRegistry testtrans)
18041519 , testCase "RegistryRemoteProcess" (testRegistryRemoteProcess testtrans)
18051520 , testCase "RemoteRegistry" (testRemoteRegistry testtrans)
18061521 , testCase "RemoteRegistryRemoteProcess" (testRemoteRegistryRemoteProcess testtrans)
@@ -1814,7 +1529,6 @@ tests testtrans = return [
18141529 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
18151530 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
18161531 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817− , testCase "ChanLifecycle" (testChanLifecycle testtrans)
18181532 , testCase "KillLocal" (testKillLocal testtrans)
18191533 , testCase "KillRemote" (testKillRemote testtrans)
18201534 , testCase "Die" (testDie testtrans)
@@ -1824,13 +1538,10 @@ tests testtrans = return [
18241538 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
18251539 , testCase "ExitLocal" (testExitLocal testtrans)
18261540 , testCase "ExitRemote" (testExitRemote testtrans)
1827− , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
18281541 , testCase "TextCallLocal" (testCallLocal testtrans)
18291542 -- Unsafe Primitives
18301543 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
1831− , testCase "TestUnsafeUSend" (testUnsafeUSend testtrans)
18321544 , testCase "TestUnsafeNSend" (testUnsafeNSend testtrans)
1833− , testCase "TestUnsafeNSendRemote" (testUnsafeNSendRemote testtrans)
18341545 , testCase "TestUnsafeSendChan" (testUnsafeSendChan testtrans)
18351546 -- usend
18361547 , testCase "USend" (testUSend usend testtrans 50)
@@ -1845,7 +1556,8 @@ tests testtrans = return [
18451556 -- The "missing" combinations in the list below don't make much sense, as
18461557 -- we cannot guarantee that the monitor reply or link exception will not
18471558 -- happen before the unmonitor or unlink
1848− testCase "MonitorNormalTermination" (testMonitorNormalTermination testtrans True False)
1559+ testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1560+ , testCase "MonitorNormalTermination" (testMonitorNormalTermination testtrans True False)
18491561 , testCase "MonitorAbnormalTermination" (testMonitorAbnormalTermination testtrans True False)
18501562 , testCase "MonitorLocalDeadProcess" (testMonitorLocalDeadProcess testtrans True False)
18511563 , testCase "MonitorRemoteDeadProcess" (testMonitorRemoteDeadProcess testtrans True False)
@@ -1867,13 +1579,20 @@ tests testtrans = return [
18671579 , testCase "MonitorLiveNode" (testMonitorLiveNode testtrans)
18681580 , testCase "MonitorChannel" (testMonitorChannel testtrans)
18691581 -- Reconnect
1870− ]
1871−
1872− -- Tests that fail occasionally and should be revised
1873− , testGroup "Flaky" [
1874− testCase "Reconnect" (testReconnect testtrans)
1875− , testCase "Registry" (testRegistry testtrans)
1876− , testCase "MergeChannels" (testMergeChannels testtrans)
1877− , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1582+ , testCase "Reconnect" (testReconnect testtrans)
18781583 ]
18791584 ]
1585+
1586+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1587+syncBreakConnection breakConnection nid0 nid1 = do
1588+ m <- newEmptyMVar
1589+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1590+ runProcess nid0 $ do
1591+ them <- liftIO $ takeMVar m
1592+ pinger <- spawnLocal $ forever $ send them ()
1593+ _ <- monitorNode (localNodeId nid1)
1594+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1595+ (nodeAddress $ localNodeId nid1)
1596+ NodeMonitorNotification _ _ _ <- expect
1597+ kill pinger "finished"
1598+ return ()