@@ -25,18 +25,13 @@ import Control.Concurrent.MVar
26import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
26import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
27import Control.Exception (SomeException, throwIO, ErrorCall(..))
27import Control.Exception (SomeException, throwIO, ErrorCall(..))
28−import Control.Monad.Catch (try, catch, finally, mask, onException)
28+import qualified Control.Exception as Ex (catch)
29−import Control.Applicative ((<|>))
29+import Control.Applicative ((<$>), (<*>), pure, (<|>))
30import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
30import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
31−import Control.Distributed.Process hiding
31+import Control.Distributed.Process
38import Control.Distributed.Process.Internal.Types
32import Control.Distributed.Process.Internal.Types
33+ ( NodeId(nodeAddress)
39− ( LocalNode(localEndPoint)
34+ , LocalNode(localEndPoint)
40 , ProcessExitException(..)
35 , ProcessExitException(..)
41 , nullProcessId
36 , nullProcessId
42 , createUnencodedMessage
37 , createUnencodedMessage
@@ -44,13 +39,12 @@ import Control.Distributed.Process.Internal.Types
44import Control.Distributed.Process.Node
39import Control.Distributed.Process.Node
45import Control.Distributed.Process.Debug
40import Control.Distributed.Process.Debug
46import Control.Distributed.Process.Management.Internal.Types
41import Control.Distributed.Process.Management.Internal.Types
47−import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
48import Control.Distributed.Process.Serializable (Serializable)
42import Control.Distributed.Process.Serializable (Serializable)
49−import Data.Maybe (isNothing, isJust)
43+
50−import Test.HUnit (Assertion, assertBool, assertFailure)
44+import Test.HUnit (Assertion, assertFailure, assertBool)
51import Test.Framework (Test, testGroup)
45import Test.Framework (Test, testGroup)
52import Test.Framework.Providers.HUnit (testCase)
46import Test.Framework.Providers.HUnit (testCase)
53−import Control.Rematch hiding (match, isNothing, isJust)
47+import Control.Rematch hiding (match)
54import Control.Rematch.Run (Match(..))
48import Control.Rematch.Run (Match(..))
56newtype Ping = Ping ProcessId
50newtype Ping = Ping ProcessId
@@ -73,7 +67,7 @@ expectThat a matcher = case res of
73forkTry :: IO () -> IO ThreadId
67forkTry :: IO () -> IO ThreadId
74forkTry p = do
68forkTry p = do
75 tid <- myThreadId
69 tid <- myThreadId
76− forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
70+ forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
78-- | The ping server from the paper
72-- | The ping server from the paper
79ping :: Process ()
73ping :: Process ()
@@ -83,46 +77,12 @@ ping = do
83 send partner (Ping self)
77 send partner (Ping self)
86−verifyClient :: String -> MVar Bool -> IO ()
87−verifyClient s b = takeMVar b >>= assertBool s
89−expectPing :: MVar Bool -> Process ()
90−expectPing mv = expect >>= liftIO . putMVar mv . checkPing
92− checkPing (Ping _) = True
94-- | Quick and dirty synchronous version of whereisRemoteAsync
80-- | Quick and dirty synchronous version of whereisRemoteAsync
95whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
81whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
96whereisRemote nid string = do
82whereisRemote nid string = do
97 whereisRemoteAsync nid string
83 whereisRemoteAsync nid string
99− match (\(WhereIsReply _ mPid) -> return mPid)
84+ WhereIsReply _ mPid <- expect
102−verifyWhereIsRemote :: NodeId -> String -> Process ProcessId
103−verifyWhereIsRemote n s = whereisRemote n s >>= maybe (die "remote name not found") return
105−waitForExit :: ProcessId -> Process DiedReason
106−waitForExit pid = monitor pid >>= waitForDown
108−waitForDown :: MonitorRef -> Process DiedReason
110− receiveWait [ matchIf (\(ProcessMonitorNotification ref' _ _) -> ref == ref')
111− (\(ProcessMonitorNotification _ _ dr) -> return dr) ]
113−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
114−syncBreakConnection breakConnection nid0 nid1 = do
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 ()
85+ return mPid
127data Add = Add ProcessId Double Double deriving (Typeable)
87data Add = Add ProcessId Double Double deriving (Typeable)
128data Divide = Divide ProcessId Double Double deriving (Typeable)
88data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -197,18 +157,12 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
197 unmonitor ref
157 unmonitor ref
198 liftIO $ putMVar done ()
158 liftIO $ putMVar done ()
199 (False, ref) -> do
159 (False, ref) -> do
201− match (\(ProcessMonitorNotification ref' pid reason') -> do
160+ ProcessMonitorNotification ref' pid reason' <- expect
203− assertBool "Bad Monitor Signal"
204− (Just ref' == ref && pid == theirAddr &&
161+ True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
205− mOrL && reason == reason')
206− putMVar done ())
162+ liftIO $ putMVar done ()
209 (\(ProcessLinkException pid reason') -> do
164 (\(ProcessLinkException pid reason') -> do
210− (liftIO $ assertBool "link exception unmatched" $
211− pid == theirAddr && not mOrL && not un && reason == reason')
165+ True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
212 liftIO $ putMVar done ()
166 liftIO $ putMVar done ()
@@ -239,10 +193,8 @@ testPing TestTransport{..} = do
239 pid <- getSelfPid
193 pid <- getSelfPid
240 replicateM_ numPings $ do
194 replicateM_ numPings $ do
241 send pingServer (Pong pid)
195 send pingServer (Pong pid)
242− p <- expectTimeout 3000000
196+ Ping _ <- expect
244− Just (Ping _) -> return ()
197+ return ()
245− Nothing -> die "Failed to receive Ping"
247 putMVar clientDone ()
199 putMVar clientDone ()
@@ -329,7 +281,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
329 runProcess localNode $ do
281 runProcess localNode $ do
330 monitor theirAddr
282 monitor theirAddr
331 -- wait for the process to die
283 -- wait for the process to die
332− expect :: Process ProcessMonitorNotification
284+ ProcessMonitorNotification _ _ _ <- expect
333 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
285 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
335 takeMVar done
287 takeMVar done
@@ -403,17 +355,14 @@ testMath TestTransport{..} = do
403 runProcess localNode $ do
355 runProcess localNode $ do
404 pid <- getSelfPid
356 pid <- getSelfPid
405 send mathServer (Add pid 1 2)
357 send mathServer (Add pid 1 2)
406− three <- expect :: Process Double
358+ 3 <- expect :: Process Double
407 send mathServer (Divide pid 8 2)
359 send mathServer (Divide pid 8 2)
408− four <- expect :: Process Double
360+ 4 <- expect :: Process Double
409 send mathServer (Divide pid 8 0)
361 send mathServer (Divide pid 8 0)
410− divByZ <- expect
362+ DivByZero <- expect
411− liftIO $ putMVar clientDone (three, four, divByZ)
363+ liftIO $ putMVar clientDone ()
413− res <- takeMVar clientDone
365+ takeMVar clientDone
415− (3, 4, DivByZero) -> return ()
416− _ -> error $ "Something went horribly wrong"
418-- | Send first message (i.e. connect) to an already terminated process
367-- | Send first message (i.e. connect) to an already terminated process
419-- (without monitoring); then send another message to a second process on
368-- (without monitoring); then send another message to a second process on
@@ -441,9 +390,11 @@ testSendToTerminated TestTransport{..} = do
441 pid <- getSelfPid
390 pid <- getSelfPid
442 send server1 "Hi"
391 send server1 "Hi"
443 send server2 (Pong pid)
392 send server2 (Pong pid)
394+ True <- return $ pid' == server2
444− expectPing clientDone
395+ liftIO $ putMVar clientDone ()
446− verifyClient "Expected Ping from server" clientDone
397+ takeMVar clientDone
448-- | Test (non-zero) timeout
399-- | Test (non-zero) timeout
449testTimeout :: TestTransport -> Assertion
400testTimeout :: TestTransport -> Assertion
@@ -452,10 +403,10 @@ testTimeout TestTransport{..} = do
452 done <- newEmptyMVar
403 done <- newEmptyMVar
454 runProcess localNode $ do
405 runProcess localNode $ do
455− res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
406+ Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
456− liftIO $ putMVar done $ res == Nothing
407+ liftIO $ putMVar done ()
458− verifyClient "Expected receiveTimeout to timeout..." done
409+ takeMVar done
460-- | Test zero timeout
411-- | Test zero timeout
461testTimeout0 :: TestTransport -> Assertion
412testTimeout0 :: TestTransport -> Assertion
@@ -483,9 +434,10 @@ testTimeout0 TestTransport{..} = do
483 -- is not interested in, and then a single message that it wants
434 -- is not interested in, and then a single message that it wants
484 replicateM_ 10000 $ send server "Irrelevant message"
435 replicateM_ 10000 $ send server "Irrelevant message"
485 send server (Pong pid)
436 send server (Pong pid)
486− expectPing clientDone
438+ liftIO $ putMVar clientDone ()
488− verifyClient "Expected Ping from server" clientDone
440+ takeMVar clientDone
490-- | Test typed channels
442-- | Test typed channels
491testTypedChannels :: TestTransport -> Assertion
443testTypedChannels :: TestTransport -> Assertion
@@ -508,10 +460,10 @@ testTypedChannels TestTransport{..} = do
508 runProcess localNode $ do
460 runProcess localNode $ do
509 (clientSendPort, rport) <- newChan
461 (clientSendPort, rport) <- newChan
510 sendChan serverSendPort (clientSendPort, 5)
462 sendChan serverSendPort (clientSendPort, 5)
511− ch <- receiveChan rport
463+ False <- receiveChan rport
512− liftIO $ putMVar clientDone $ ch == False
464+ liftIO $ putMVar clientDone ()
514− verifyClient "Expected channel to send 'False'" clientDone
466+ takeMVar clientDone
516-- | Test merging receive ports
468-- | Test merging receive ports
517testMergeChannels :: TestTransport -> Assertion
469testMergeChannels :: TestTransport -> Assertion
@@ -534,8 +486,9 @@ testMergeChannels TestTransport{..} = do
534 rs <- mapM charChannel "abc"
486 rs <- mapM charChannel "abc"
535 m <- mergePorts biased rs
487 m <- mergePorts biased rs
536 xs <- replicateM 9 $ receiveChan m
488 xs <- replicateM 9 $ receiveChan m
537− liftIO $ putMVar done $ xs == expected
489+ True <- return $ xs == expected
538− verifyClient "Expected single layer merge to match expected ordering" done
490+ liftIO $ putMVar done ()
540 -- Two layers of merging
493 -- Two layers of merging
541 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
494 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -546,8 +499,9 @@ testMergeChannels TestTransport{..} = do
546 ms <- mapM (mergePorts biasedInner) rss
499 ms <- mapM (mergePorts biasedInner) rss
547 m <- mergePorts biasedOuter ms
500 m <- mergePorts biasedOuter ms
548 xs <- replicateM (9 * 3) $ receiveChan m
501 xs <- replicateM (9 * 3) $ receiveChan m
549− liftIO $ putMVar done $ xs == expected
502+ True <- return $ xs == expected
550− verifyClient "Expected nested channels to match expeted ordering" done
503+ liftIO $ putMVar done ()
552 -- Test that if no messages are (immediately) available, the scheduler makes no difference
506 -- Test that if no messages are (immediately) available, the scheduler makes no difference
553 testBlocked :: LocalNode -> Bool -> IO ()
507 testBlocked :: LocalNode -> Bool -> IO ()
@@ -556,45 +510,43 @@ testMergeChannels TestTransport{..} = do
556 done <- newEmptyMVar
510 done <- newEmptyMVar
558 forkProcess localNode $ do
512 forkProcess localNode $ do
559− ss <- liftIO $ mapM readMVar vs
513+ [sa, sb, sc] <- liftIO $ mapM readMVar vs
562− mapM_ ((>> pause 10000) . uncurry sendChan)
514+ mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
563− [ -- a, b, c
515+ [ -- a, b, c
564− (sa, 'a')
516+ (sa, 'a')
565− , (sb, 'b')
517+ , (sb, 'b')
566− , (sc, 'c')
518+ , (sc, 'c')
567− -- a, c, b
519+ -- a, c, b
568− , (sa, 'a')
520+ , (sa, 'a')
569− , (sc, 'c')
521+ , (sc, 'c')
570− , (sb, 'b')
522+ , (sb, 'b')
571− -- b, a, c
523+ -- b, a, c
572− , (sb, 'b')
524+ , (sb, 'b')
573− , (sa, 'a')
525+ , (sa, 'a')
574− , (sc, 'c')
526+ , (sc, 'c')
575− -- b, c, a
527+ -- b, c, a
576− , (sb, 'b')
528+ , (sb, 'b')
577− , (sc, 'c')
529+ , (sc, 'c')
578− , (sa, 'a')
530+ , (sa, 'a')
579− -- c, a, b
531+ -- c, a, b
580− , (sc, 'c')
532+ , (sc, 'c')
581− , (sa, 'a')
533+ , (sa, 'a')
582− , (sb, 'b')
534+ , (sb, 'b')
583− -- c, b, a
535+ -- c, b, a
584− , (sc, 'c')
536+ , (sc, 'c')
585− , (sb, 'b')
537+ , (sb, 'b')
586− , (sa, 'a')
538+ , (sa, 'a')
588− _ -> die "Something went horribly wrong"
590 forkProcess localNode $ do
541 forkProcess localNode $ do
591 (ss, rs) <- unzip <$> replicateM 3 newChan
542 (ss, rs) <- unzip <$> replicateM 3 newChan
592 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
543 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
593 m <- mergePorts biased rs
544 m <- mergePorts biased rs
594 xs <- replicateM (6 * 3) $ receiveChan m
545 xs <- replicateM (6 * 3) $ receiveChan m
595− liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
546+ True <- return $ xs == "abcacbbacbcacabcba"
547+ liftIO $ putMVar done ()
597− verifyClient "Expected merged ports to match expected ordering" done
549+ takeMVar done
599 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
551 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
600 mergePorts True = mergePortsBiased
552 mergePorts True = mergePortsBiased
@@ -612,9 +564,8 @@ testTerminate TestTransport{..} = do
612 localNode <- newLocalNode testTransport initRemoteTable
564 localNode <- newLocalNode testTransport initRemoteTable
613 runProcess localNode $ do
565 runProcess localNode $ do
614 e <- try terminate :: Process (Either ProcessTerminationException ())
566 e <- try terminate :: Process (Either ProcessTerminationException ())
615− if either show show e == show ProcessTerminationException
567+ True <- return $ either show show e == show ProcessTerminationException
616− then return ()
568+ return ()
617− else die "Unexpected result from terminate"
619testMonitorNode :: TestTransport -> Assertion
570testMonitorNode :: TestTransport -> Assertion
620testMonitorNode TestTransport{..} = do
571testMonitorNode TestTransport{..} = do
@@ -625,12 +576,11 @@ testMonitorNode TestTransport{..} = do
626 runProcess node2 $ do
577 runProcess node2 $ do
627 ref <- monitorNode (localNodeId node1)
578 ref <- monitorNode (localNodeId node1)
629− match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
579+ NodeMonitorNotification ref' nid DiedDisconnect <- expect
630− return $ ref == ref' && nid == localNodeId node1)
580+ True <- return $ ref == ref' && nid == localNodeId node1
631− ] >>= liftIO . putMVar done
581+ liftIO $ putMVar done ()
633− verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
583+ takeMVar done
635testMonitorLiveNode :: TestTransport -> Assertion
585testMonitorLiveNode :: TestTransport -> Assertion
636testMonitorLiveNode TestTransport{..} = do
586testMonitorLiveNode TestTransport{..} = do
@@ -645,16 +595,15 @@ testMonitorLiveNode TestTransport{..} = do
645 liftIO $ putMVar ready ()
595 liftIO $ putMVar ready ()
646 liftIO $ takeMVar readyr
596 liftIO $ takeMVar readyr
647 send p ()
597 send p ()
649− match (\(NodeMonitorNotification ref' nid _) ->
598+ NodeMonitorNotification ref' nid _ <- expect
650− (return $ ref == ref' && nid == localNodeId node1))
599+ True <- return $ ref == ref' && nid == localNodeId node1
651− ] >>= liftIO . putMVar done
600+ liftIO $ putMVar done ()
653 takeMVar ready
602 takeMVar ready
654 closeLocalNode node1
603 closeLocalNode node1
655 putMVar readyr ()
604 putMVar readyr ()
657− verifyClient "Expected NodeMonitorNotification for LIVE node" done
606+ takeMVar done
659testMonitorChannel :: TestTransport -> Assertion
608testMonitorChannel :: TestTransport -> Assertion
660testMonitorChannel TestTransport{..} = do
609testMonitorChannel TestTransport{..} = do
@@ -664,20 +613,18 @@ testMonitorChannel TestTransport{..} = do
664 pid <- forkProcess node1 $ do
613 pid <- forkProcess node1 $ do
665 sport <- expect :: Process (SendPort ())
614 sport <- expect :: Process (SendPort ())
666 ref <- monitorPort sport
615 ref <- monitorPort sport
667− receiveWait [
616+ PortMonitorNotification ref' port' reason <- expect
668− -- reason might be DiedUnknownId if the receive port is GCed before the
617+ -- reason might be DiedUnknownId if the receive port is GCed before the
669− -- monitor is established (TODO: not sure that this is reasonable)
618+ -- 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))
619+ return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
673− ] >>= liftIO . putMVar gotNotification
620+ liftIO $ putMVar gotNotification ()
675 runProcess node2 $ do
622 runProcess node2 $ do
676 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
623 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
677 send pid sport
624 send pid sport
678 liftIO $ threadDelay 100000
625 liftIO $ threadDelay 100000
680− verifyClient "Expected PortMonitorNotification" gotNotification
627+ takeMVar gotNotification
682testRegistry :: TestTransport -> Assertion
629testRegistry :: TestTransport -> Assertion
683testRegistry TestTransport{..} = do
630testRegistry TestTransport{..} = do
@@ -689,28 +636,20 @@ testRegistry TestTransport{..} = do
690 runProcess node $ do
637 runProcess node $ do
691 register "ping" pingServer
638 register "ping" pingServer
692− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
639+ Just pid <- whereis "ping"
640+ True <- return $ pingServer == pid
693 us <- getSelfPid
641 us <- getSelfPid
694 nsend "ping" (Pong us)
642 nsend "ping" (Pong us)
695− receiveWait [
643+ Ping pid' <- expect
696− matchIf (\(Ping pid') -> pingServer == pid') (const $ return ())
644+ True <- return $ pingServer == pid'
697− ]
645+ Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
698− checkRegException "dead" Nothing deadProcess
646+ Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
699− checkRegException "ping" (Just pingServer) deadProcess
647+ True <- return $ x == pingServer
700− try (unregister "dead") >>= checkReg "dead" Nothing
648+ Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
701 liftIO $ putMVar done ()
649 liftIO $ putMVar done ()
703 takeMVar done
651 takeMVar done
706− checkRegException name pid dead =
707− try (register name dead) >>= checkReg name pid
709− checkReg name pid res =
711− Left (ProcessRegistrationException name pid) -> return ()
712− _ -> die $ "Unexpected Registration" ++ show res
714testRegistryRemoteProcess :: TestTransport -> Assertion
653testRegistryRemoteProcess :: TestTransport -> Assertion
715testRegistryRemoteProcess TestTransport{..} = do
654testRegistryRemoteProcess TestTransport{..} = do
716 node1 <- newLocalNode testTransport initRemoteTable
655 node1 <- newLocalNode testTransport initRemoteTable
@@ -721,13 +660,13 @@ testRegistryRemoteProcess TestTransport{..} = do
722 runProcess node2 $ do
661 runProcess node2 $ do
723 register "ping" pingServer
662 register "ping" pingServer
724− whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
663+ Just pid <- whereis "ping"
664+ True <- return $ pingServer == pid
725 us <- getSelfPid
665 us <- getSelfPid
726 nsend "ping" (Pong us)
666 nsend "ping" (Pong us)
727− receiveWait [
667+ Ping pid' <- expect
728− matchIf (\(Ping pid') -> pingServer == pid')
668+ True <- return $ pingServer == pid'
729− (const $ liftIO $ putMVar done ())
669+ liftIO $ putMVar done ()
732 takeMVar done
671 takeMVar done
@@ -735,6 +674,7 @@ testRemoteRegistry :: TestTransport -> Assertion
735testRemoteRegistry TestTransport{..} = do
674testRemoteRegistry TestTransport{..} = do
736 node1 <- newLocalNode testTransport initRemoteTable
675 node1 <- newLocalNode testTransport initRemoteTable
737 node2 <- newLocalNode testTransport initRemoteTable
676 node2 <- newLocalNode testTransport initRemoteTable
677+ done <- newEmptyMVar
739 pingServer <- forkProcess node1 ping
679 pingServer <- forkProcess node1 ping
740 deadProcess <- forkProcess node1 (return ())
680 deadProcess <- forkProcess node1 (return ())
@@ -747,34 +687,32 @@ testRemoteRegistry TestTransport{..} = do
747 "ping" == label' && pid == pingServer)
687 "ping" == label' && pid == pingServer)
748 (\(RegisterReply _ _ _) -> return ()) ]
688 (\(RegisterReply _ _ _) -> return ()) ]
750− pid <- verifyWhereIsRemote nid1 "ping"
690+ Just pid <- whereisRemote nid1 "ping"
751− liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
691+ True <- return $ pingServer == pid
753 us <- getSelfPid
692 us <- getSelfPid
754 nsendRemote nid1 "ping" (Pong us)
693 nsendRemote nid1 "ping" (Pong us)
755− receiveWait [
694+ Ping pid' <- expect
756− match (\(Ping pid') -> return $ pingServer == pid')
695+ True <- return $ pingServer == pid'
757− ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
759 -- test that if process was not registered Nothing is returned
697 -- test that if process was not registered Nothing is returned
760 -- in owner field.
698 -- in owner field.
761 registerRemoteAsync nid1 "dead" deadProcess
699 registerRemoteAsync nid1 "dead" deadProcess
762− receiveWait [ matchIf (\(RegisterReply label' f mPid) -> "dead" == label')
701+ matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
763− (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
702+ (\(RegisterReply _ _ _) -> return ()) ]
764− ] >>= liftIO . assertBool "Expected False Nothing in RegisterReply"
766 registerRemoteAsync nid1 "ping" deadProcess
703 registerRemoteAsync nid1 "ping" deadProcess
767 receiveWait [
704 receiveWait [
768− matchIf (\(RegisterReply label' False mPid) ->
705+ matchIf (\(RegisterReply label' False (Just pid)) ->
769− "ping" == label' && isJust mPid)
706+ "ping" == label' && pid == pingServer)
770− (\(RegisterReply _ f (Just pid'')) -> return (not f && pid'' == pingServer))
707+ (\(RegisterReply _ _ _) -> return ()) ]
771− ] >>= liftIO . assertBool "Expected False and (Just alreadyRegisteredPid) in RegisterReply"
773 unregisterRemoteAsync nid1 "dead"
708 unregisterRemoteAsync nid1 "dead"
774 receiveWait [
709 receiveWait [
775− matchIf (\(RegisterReply label' _ _) -> "dead" == label')
710+ matchIf (\(RegisterReply label' False Nothing) ->
711+ "dead" == label' && pid == pingServer)
776− (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
712+ (\(RegisterReply _ _ _) -> return ()) ]
777− ] >>= liftIO . assertBool "Expected False and Nothing in RegisterReply"
713+ liftIO $ putMVar done ()
779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
717testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
780testRemoteRegistryRemoteProcess TestTransport{..} = do
718testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -790,15 +728,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
790 receiveWait [
728 receiveWait [
791 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
729 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
792 (\(RegisterReply _ _ _) -> return ()) ]
730 (\(RegisterReply _ _ _) -> return ()) ]
793− pid <- verifyWhereIsRemote nid1 "ping"
731+ Just pid <- whereisRemote nid1 "ping"
794− liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
732+ True <- return $ pingServer == pid
795 us <- getSelfPid
733 us <- getSelfPid
796 nsendRemote nid1 "ping" (Pong us)
734 nsendRemote nid1 "ping" (Pong us)
797− receiveWait [
735+ Ping pid' <- expect
798− match (\(Ping pid') -> return $ pingServer == pid')
736+ True <- return $ pingServer == pid'
799− ] >>= liftIO . putMVar done
737+ liftIO $ putMVar done ()
801− verifyClient "Expected Ping with ping server's ProcessId" done
739+ takeMVar done
803testSpawnLocal :: TestTransport -> Assertion
741testSpawnLocal :: TestTransport -> Assertion
804testSpawnLocal TestTransport{..} = do
742testSpawnLocal TestTransport{..} = do
@@ -812,14 +750,15 @@ testSpawnLocal TestTransport{..} = do
812 sport <- expect
750 sport <- expect
813 sendChan sport (1234 :: Int)
751 sendChan sport (1234 :: Int)
815− sport <- spawnChannelLocal $
753+ sport <- spawnChannelLocal $ \rport -> do
816− \rport -> (receiveChan rport :: Process Int) >>= send us
754+ (1234 :: Int) <- receiveChan rport
818 send pid sport
757 send pid sport
819− expect >>= liftIO . putMVar done
759+ liftIO $ putMVar done ()
821− res <- takeMVar done
761+ takeMVar done
822− assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
824testSpawnAsyncStrictness :: TestTransport -> Assertion
763testSpawnAsyncStrictness :: TestTransport -> Assertion
825testSpawnAsyncStrictness TestTransport{..} = do
764testSpawnAsyncStrictness TestTransport{..} = do
@@ -848,9 +787,8 @@ testReconnect TestTransport{..} = do
848 liftIO $ putMVar processA us
787 liftIO $ putMVar processA us
849 msg1 <- expect
788 msg1 <- expect
850 msg2 <- expect
789 msg2 <- expect
852− assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
790+ True <- return $ msg1 == "message 1" && msg2 == "message 3"
853− putMVar sendTestOk ()
791+ liftIO $ putMVar sendTestOk ()
855 forkProcess node2 $ do
793 forkProcess node2 $ do
@@ -883,7 +821,7 @@ testReconnect TestTransport{..} = do
883 matchIf (\(RegisterReply label' _ _) -> "a" == label')
821 matchIf (\(RegisterReply label' _ _) -> "a" == label')
884 (\(RegisterReply _ _ _) -> return ()) ]
822 (\(RegisterReply _ _ _) -> return ()) ]
886− _ <- whereisRemote nid1 "a"
824+ Just _ <- whereisRemote nid1 "a"
889 -- Simulate network failure
827 -- Simulate network failure
@@ -902,10 +840,9 @@ testReconnect TestTransport{..} = do
902 (\(RegisterReply _ _ _) -> return ()) ]
840 (\(RegisterReply _ _ _) -> return ()) ]
905− mPid <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
843+ Nothing <- 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
844+ Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
908− verifyWhereIsRemote nid1 "c"
845+ Just _ <- whereisRemote nid1 "c"
910 liftIO $ putMVar registerTestOk ()
847 liftIO $ putMVar registerTestOk ()
@@ -946,19 +883,19 @@ testUSend usendPrim TestTransport{..} numMessages = do
946 isSorted _ = True
883 isSorted _ = True
947 -- The list can't be null since there are no failures after sending
884 -- The list can't be null since there are no failures after sending
948 -- the last message.
885 -- the last message.
949− liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
886+ True <- return $ isSorted msgs && not (null msgs)
887+ liftIO $ putMVar usendTestOk ()
951 forkProcess node2 $ do
889 forkProcess node2 $ do
952 them <- liftIO $ readMVar processA
890 them <- liftIO $ readMVar processA
953 getSelfPid >>= send them
891 getSelfPid >>= send them
954− expect :: Process ()
892+ () <- expect
955 forM_ [1..numMessages] $ \i -> do
893 forM_ [1..numMessages] $ \i -> do
956 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
894 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
957 usendPrim them i
895 usendPrim them i
958 liftIO (threadDelay 30000)
896 liftIO (threadDelay 30000)
960− res <- takeMVar usendTestOk
898+ takeMVar usendTestOk
961− assertBool "Unexpected failure after sending last msg" res
963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
900-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
964-- in between
901-- in between
@@ -984,17 +921,14 @@ testMatchAny TestTransport{..} = do
984 runProcess localNode $ do
921 runProcess localNode $ do
985 pid <- getSelfPid
922 pid <- getSelfPid
986 send mathServer (Add pid 1 2)
923 send mathServer (Add pid 1 2)
987− three <- expect :: Process Double
924+ 3 <- expect :: Process Double
988 send mathServer (Divide pid 8 2)
925 send mathServer (Divide pid 8 2)
989− four <- expect :: Process Double
926+ 4 <- expect :: Process Double
990 send mathServer (Divide pid 8 0)
927 send mathServer (Divide pid 8 0)
991− divByZ <- expect
928+ DivByZero <- expect
992− liftIO $ putMVar clientDone (three, four, divByZ)
929+ liftIO $ putMVar clientDone ()
994− res <- takeMVar clientDone
931+ takeMVar clientDone
996− (3, 4, DivByZero) -> return ()
997− _ -> error "Unexpected result"
999-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
933-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
1000-- in between, however we block 'Divide' requests ....
934-- in between, however we block 'Divide' requests ....
@@ -1021,13 +955,12 @@ testMatchAnyHandle TestTransport{..} = do
1021 runProcess localNode $ do
955 runProcess localNode $ do
1022 pid <- getSelfPid
956 pid <- getSelfPid
1023 send mathServer (Add pid 1 2)
957 send mathServer (Add pid 1 2)
1024− three <- expect :: Process Double
958+ 3 <- expect :: Process Double
1025 send mathServer (Divide pid 8 2)
959 send mathServer (Divide pid 8 2)
1026− res <- (expectTimeout 100000) :: Process (Maybe Double)
960+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1027− liftIO $ putMVar clientDone $ three == 3 && res == Nothing
961+ liftIO $ putMVar clientDone ()
1029− verifyClient "Expected Nothing (i.e. timeout)" clientDone
1031 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
964 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1032 maybeForward s msg =
965 maybeForward s msg =
1033 handleMessage msg (\m@(Add _ _ _) -> send s m)
966 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -1055,10 +988,8 @@ testMatchAnyNoHandle TestTransport{..} = do
1055 Just _ -> die "NONSENSE")
988 Just _ -> die "NONSENSE")
1057 -- we *must* have removed the message from our mailbox though!!!
990 -- we *must* have removed the message from our mailbox though!!!
1058− res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
991+ Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1060− assertBool "Expected timeout!" $ res == Nothing
1061− putMVar serverDone ()
992+ liftIO $ putMVar serverDone ()
1062 putMVar addr server
993 putMVar addr server
1064 -- Client
995 -- Client
@@ -1101,21 +1032,14 @@ testMatchAnyIf TestTransport{..} = do
1101 runProcess localNode $ do
1032 runProcess localNode $ do
1102 pid <- getSelfPid
1033 pid <- getSelfPid
1103 send server (pid, "foo")
1034 send server (pid, "foo")
1104− foo <- expect
1035+ "foo" <- expect
1105− -- provoking what would be the wrong ordering is informative here...
1107− send server (pid, "bar")
1108− bar <- (expectTimeout 100000) :: Process (Maybe String) -- was Double o_O !?
1110 send server (pid, "baz")
1036 send server (pid, "baz")
1111− baz <- expect
1037+ "baz" <- expect
1112−
1038+ send server (pid, "bar")
1039+ Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1113− liftIO $ putMVar clientDone (foo, bar, baz)
1040+ liftIO $ putMVar clientDone ()
1115− res <- takeMVar clientDone
1116− let res' = res == ("foo", Nothing, "baz")
1117− assertBool "Expected timeout due to type mismatch" res'
1042+ takeMVar clientDone
1119 where tryHandleMessage :: Message -> Process (Maybe ())
1043 where tryHandleMessage :: Message -> Process (Maybe ())
1120 tryHandleMessage msg =
1044 tryHandleMessage msg =
1121 handleMessage msg (\(pid :: ProcessId, (m :: String))
1045 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1148,13 +1072,12 @@ testMatchMessageWithUnwrap TestTransport{..} = do
1148 runProcess localNode $ do
1072 runProcess localNode $ do
1149 pid <- getSelfPid
1073 pid <- getSelfPid
1150 send server (pid, wrapMessage ("foo" :: String))
1074 send server (pid, wrapMessage ("foo" :: String))
1151− foo <- expect
1075+ "foo" <- expect
1152 send server (pid, wrapMessage ("baz" :: String))
1076 send server (pid, wrapMessage ("baz" :: String))
1153− baz <- expect
1077+ "baz" <- expect
1154− liftIO $ putMVar clientDone (foo, baz)
1078+ liftIO $ putMVar clientDone ()
1156− res <- takeMVar clientDone
1080+ takeMVar clientDone
1157− assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1159-- Test 'receiveChanTimeout'
1082-- Test 'receiveChanTimeout'
1160testReceiveChanTimeout :: TestTransport -> Assertion
1083testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1172,19 +1095,18 @@ testReceiveChanTimeout TestTransport{..} = do
1173 -- Wait for a message with a delay. No message arrives, we should get
1096 -- Wait for a message with a delay. No message arrives, we should get
1174 -- Nothing after the delay.
1097 -- Nothing after the delay.
1175− receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1098+ Nothing <- receiveChanTimeout 100000 rp
1177 -- Let the sender know that it can send a message.
1100 -- Let the sender know that it can send a message.
1178 liftIO $ putMVar mvSender ()
1101 liftIO $ putMVar mvSender ()
1180 -- Wait for a message with a delay again. Now a message arrives after
1103 -- Wait for a message with a delay again. Now a message arrives after
1181 -- 0.1 seconds
1104 -- 0.1 seconds
1182− res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1105+ Just True <- receiveChanTimeout 20000000 rp
1183− liftIO $ assertBool "Expected result to be 'True'" res
1185 -- Wait for a message with zero timeout: non-blocking check. No message is
1107 -- Wait for a message with zero timeout: non-blocking check. No message is
1186 -- available, we get Nothing
1108 -- available, we get Nothing
1187− receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1109+ Nothing <- receiveChanTimeout 0 rp
1189 -- Let the sender know that it can send a message.
1111 -- Let the sender know that it can send a message.
1190 liftIO $ putMVar mvSender ()
1112 liftIO $ putMVar mvSender ()
@@ -1194,7 +1116,7 @@ testReceiveChanTimeout TestTransport{..} = do
1194 liftIO $ threadDelay 100000
1116 liftIO $ threadDelay 100000
1195 mb <- receiveChanTimeout 0 rp
1117 mb <- receiveChanTimeout 0 rp
1196 case mb of
1118 case mb of
1197− Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1119+ Just b -> do False <- return b; return ()
1198 _ -> loop
1120 _ -> loop
1200 liftIO $ putMVar done ()
1122 liftIO $ putMVar done ()
@@ -1231,8 +1153,8 @@ testReceiveChanFeatures TestTransport{..} = do
1232 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1154 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1234− receiveChan rp1 >>= liftIO . assertBool "Expected True"
1156+ True <- receiveChan rp1
1235− receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1157+ False <- receiveChan rp1
1237 -- Test Applicative instance
1159 -- Test Applicative instance
@@ -1241,7 +1163,7 @@ testReceiveChanFeatures TestTransport{..} = do
1242 let rp2 = pure (+) <*> rpInt <*> rpInt
1164 let rp2 = pure (+) <*> rpInt <*> rpInt
1244− receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1166+ 7 <- receiveChan rp2
1246 -- Test Alternative instance
1168 -- Test Alternative instance
@@ -1250,8 +1172,8 @@ testReceiveChanFeatures TestTransport{..} = do
1251 let rp3 = (even <$> rpInt) <|> rpBool
1173 let rp3 = (even <$> rpInt) <|> rpBool
1253− receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1175+ False <- receiveChan rp3
1254− receiveChan rp3 >>= liftIO . assertBool "Expected True"
1176+ True <- receiveChan rp3
1256 -- Test Monad instance
1178 -- Test Monad instance
@@ -1265,86 +1187,17 @@ testReceiveChanFeatures TestTransport{..} = do
1265 then rpInt
1187 then rpInt
1266 else return 7
1188 else return 7
1268− receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1190+ 5 <- receiveChan rp4
1269− receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1191+ 7 <- receiveChan rp4
1271 liftIO $ putMVar done ()
1193 liftIO $ putMVar done ()
1273 takeMVar done
1195 takeMVar done
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
1282− pid <- spawnLocal $ do tCh <- newChan :: Process (SendPort (), ReceivePort ())
1283− liftIO $ putMVar tchMV tCh
1284− expect :: Process ()
1287− expect :: Process ()
1289− mRefPid <- monitor pid
1291− cPid <- spawnLocal $ do
1292− (sp', rp) <- liftIO $ takeMVar tchMV
1293− -- say "picked up our test channel"
1295− -- say "told pid to continue"
1296− res <- receiveChanTimeout delay rp
1298− Nothing -> say "initial chan () missing!" >> (liftIO $ putMVar result False)
1299− Just () -> do mr <- monitor pid
1301− -- say "sending pid a second () will cause it to exit"
1304− -- say "make sure we see a DOWN notification for pid having stopped"
1305− receiveWait [ match (\(_ :: ProcessMonitorNotification) -> return ()) ]
1307− -- now that pid has died, the send port should be useless...
1308− liftIO $ putMVar tchMV (sp', rp)
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
1316− mRefCPid <- monitor cPid
1319− [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefPid)
1323− -- say "seen first pid die..."
1325− (sendPort, _) <- liftIO $ takeMVar tchMV
1326− sendChan sendPort ()
1327− -- say "sent () after owning pid died"
1329− -- let cPid know we've written to the channel...
1333− [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefCPid)
1337− -- say "seen both pids die now..."
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
1345testKillLocal :: TestTransport -> Assertion
1197testKillLocal :: TestTransport -> Assertion
1346testKillLocal TestTransport{..} = do
1198testKillLocal TestTransport{..} = do
1347 localNode <- newLocalNode testTransport initRemoteTable
1199 localNode <- newLocalNode testTransport initRemoteTable
1200+ done <- newEmptyMVar
1349 pid <- forkProcess localNode $ do
1202 pid <- forkProcess localNode $ do
1350 liftIO $ threadDelay 1000000
1203 liftIO $ threadDelay 1000000
@@ -1353,18 +1206,17 @@ testKillLocal TestTransport{..} = do
1353 ref <- monitor pid
1206 ref <- monitor pid
1354 us <- getSelfPid
1207 us <- getSelfPid
1355 kill pid "TestKill"
1208 kill pid "TestKill"
1356− mn <- expect
1209+ ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1358− ProcessMonitorNotification ref' pid' (DiedException ex) ->
1359− case ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill" of
1210+ True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1360− True -> return ()
1211+ liftIO $ putMVar done ()
1361− False -> die "Invalid ProcessMonitorNotification received"
1212+
1362− _ -> die "Something went horribly wrong"
1213+ takeMVar done
1364testKillRemote :: TestTransport -> Assertion
1215testKillRemote :: TestTransport -> Assertion
1365testKillRemote TestTransport{..} = do
1216testKillRemote TestTransport{..} = do
1366 node1 <- newLocalNode testTransport initRemoteTable
1217 node1 <- newLocalNode testTransport initRemoteTable
1367 node2 <- newLocalNode testTransport initRemoteTable
1218 node2 <- newLocalNode testTransport initRemoteTable
1219+ done <- newEmptyMVar
1369 pid <- forkProcess node1 $ do
1221 pid <- forkProcess node1 $ do
1370 liftIO $ threadDelay 1000000
1222 liftIO $ threadDelay 1000000
@@ -1373,17 +1225,11 @@ testKillRemote TestTransport{..} = do
1373 ref <- monitor pid
1225 ref <- monitor pid
1374 us <- getSelfPid
1226 us <- getSelfPid
1375 kill pid "TestKill"
1227 kill pid "TestKill"
1378− ProcessMonitorNotification ref' pid' (DiedException reason) ->
1228+ ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1379− case (ref == ref', pid == pid', reason == "killed-by=" ++ show us ++ ",reason=TestKill") of
1229+ True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1380− (True, True, True) -> return ()
1230+ liftIO $ putMVar done ()
1381− (a, b, c) -> do
1231+
1382− let a' = if a then "" else "Invalid ref"
1232+ takeMVar done
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"
1388testCatchesExit :: TestTransport -> Assertion
1234testCatchesExit :: TestTransport -> Assertion
1389testCatchesExit TestTransport{..} = do
1235testCatchesExit TestTransport{..} = do
@@ -1409,10 +1255,7 @@ testHandleMessageIf TestTransport{..} = do
1409 self <- getSelfPid
1255 self <- getSelfPid
1410 send self (5 :: Integer, 10 :: Integer)
1256 send self (5 :: Integer, 10 :: Integer)
1411 msg <- receiveWait [ matchMessage return ]
1257 msg <- receiveWait [ matchMessage return ]
1412− handleMessageIf msg
1258+ Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1414− (\() -> die "whoops") >>= maybe (return ())
1415− (const $ die "Expected Mismatch")
1416 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1259 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1417 (\input -> liftIO $ putMVar done input)
1260 (\input -> liftIO $ putMVar done input)
1418 return ()
1261 return ()
@@ -1457,11 +1300,8 @@ testDie TestTransport{..} = do
1457 (die ("foobar", 123 :: Int))
1300 (die ("foobar", 123 :: Int))
1458 `catchExit` \_from reason -> do
1301 `catchExit` \_from reason -> do
1459 -- TODO: should verify that 'from' has the right value
1302 -- TODO: should verify that 'from' has the right value
1460− let res = reason == ("foobar", 123 :: Int)
1303+ True <- return $ reason == ("foobar", 123 :: Int)
1461 liftIO $ putMVar done ()
1304 liftIO $ putMVar done ()
1464− else die "Something went horribly wrong"
1466 takeMVar done
1306 takeMVar done
@@ -1475,11 +1315,8 @@ testPrettyExit TestTransport{..} = do
1475 `catch` \ex@(ProcessExitException from _) ->
1315 `catch` \ex@(ProcessExitException from _) ->
1476 let expected = "exit-from=" ++ (show from)
1316 let expected = "exit-from=" ++ (show from)
1478− let res = (show ex) == expected
1318+ True <- return $ (show ex) == expected
1479 liftIO $ putMVar done ()
1319 liftIO $ putMVar done ()
1482− else die "Something went horribly wrong"
1484 takeMVar done
1321 takeMVar done
@@ -1495,26 +1332,17 @@ testExitLocal TestTransport{..} = do
1495 pid <- forkProcess localNode $ do
1332 pid <- forkProcess localNode $ do
1496 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1333 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1497 -- TODO: should verify that 'from' has the right value
1334 -- TODO: should verify that 'from' has the right value
1498− res <- return $ reason == "TestExit"
1335+ True <- return $ reason == "TestExit"
1499 liftIO $ putMVar supervisedDone ()
1336 liftIO $ putMVar supervisedDone ()
1502− else die "Something went horribly wrong"
1504 runProcess localNode $ do
1338 runProcess localNode $ do
1505 liftIO $ takeMVar handlerSetUp
1339 liftIO $ takeMVar handlerSetUp
1506 ref <- monitor pid
1340 ref <- monitor pid
1507 exit pid "TestExit"
1341 exit pid "TestExit"
1508 -- This time the client catches the exception, so it dies normally
1342 -- This time the client catches the exception, so it dies normally
1511− ProcessMonitorNotification ref' pid' DiedNormal -> do
1343+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1512− let res = ref == ref' && pid == pid'
1344+ True <- return $ ref == ref' && pid == pid'
1513− liftIO $ putMVar supervisorDone ()
1345+ liftIO $ putMVar supervisorDone ()
1516− else die "Something went horribly wrong"
1517− _ -> die "Something went horribly wrong"
1519 takeMVar supervisedDone
1347 takeMVar supervisedDone
1520 takeMVar supervisorDone
1348 takeMVar supervisorDone
@@ -1530,97 +1358,125 @@ testExitRemote TestTransport{..} = do
1530 (receiveWait [] :: Process ()) -- block forever
1358 (receiveWait [] :: Process ()) -- block forever
1531 `catchExit` \_from reason -> do
1359 `catchExit` \_from reason -> do
1532 -- TODO: should verify that 'from' has the right value
1360 -- TODO: should verify that 'from' has the right value
1533− res <- return $ reason == "TestExit"
1361+ True <- return $ reason == "TestExit"
1534 liftIO $ putMVar supervisedDone ()
1362 liftIO $ putMVar supervisedDone ()
1537− else die "Something went horribly wrong"
1539 runProcess node2 $ do
1364 runProcess node2 $ do
1540 ref <- monitor pid
1365 ref <- monitor pid
1541 exit pid "TestExit"
1366 exit pid "TestExit"
1544− ProcessMonitorNotification ref' pid' DiedNormal -> do
1367+ ProcessMonitorNotification ref' pid' DiedNormal <- expect
1545− res' <- return $ ref == ref' && pid == pid'
1368+ True <- return $ ref == ref' && pid == pid'
1546− liftIO $ putMVar supervisorDone ()
1369+ liftIO $ putMVar supervisorDone ()
1549− else die "Something went horribly wrong"
1550− _ -> die "Something went horribly wrong"
1552 takeMVar supervisedDone
1371 takeMVar supervisedDone
1553 takeMVar supervisorDone
1372 takeMVar supervisorDone
1555testRegistryMonitoring :: TestTransport -> Assertion
1374testRegistryMonitoring :: TestTransport -> Assertion
1556testRegistryMonitoring TestTransport{..} = do
1375testRegistryMonitoring TestTransport{..} = do
1557− node1 <- newLocalNode testTransport initRemoteTable
1376+ localNode <- newLocalNode testTransport initRemoteTable
1558− node2 <- newLocalNode testTransport initRemoteTable
1377+ remoteNode <- newLocalNode testTransport initRemoteTable
1560− let nid = localNodeId node2
1561− pid <- forkProcess node1 $ do
1563− runUntilRegistered nid self
1564− say $ (show self) ++ " registered as " ++ regName
1565− expect :: Process ()
1566− say $ (show self) ++ " exiting normally"
1568− runProcess node2 $ do
1380+ -- Local process. Test if local process will be removed from
1569− register regName pid
1381+ -- registry when it dies.
1570− say $ regName ++ " registered to " ++ show pid
1382+ box <- newEmptyMVar
1571− res <- whereis regName
1383+ runProcess localNode $ do
1572− send pid ()
1384+ pid <- spawnLocal $ do
1573− say $ " sent finish signal to " ++ show pid
1385+ expect
1574− us <- getSelfPid
1386+ register "test" pid
1575− liftIO $ assertBool "expected (Just pid)" $ res == (Just pid)
1387+ tpid <- whereis "test"
1576−
1388+ if tpid == Just pid
1577−
1389+ then do _ <- monitor pid
1578− -- This delay isn't essential!
1390+ send pid ()
1579− -- The test case passes perfectly fine without it (feel free to comment out
1391+ ProcessMonitorNotification{} <- expect
1580− -- and see), however waiting a few seconds here, makes it much more likely
1392+ tpid1 <- whereis "test"
1581− -- that in delayUntilMaybeUnregistered we will hit the match case right
1393+ liftIO $ putMVar box (Nothing == tpid1)
1582− -- away, and thus not be subjected to a 20 second delay. The value of 4
1394+ else liftIO $ putMVar box False
1583− -- seconds appears to work optimally on osx and across several linux distros
1395+
1584− -- running in virtual machines (which is essentially what we do in CI)
1396+ takeMVar box >>= assertBool "expected local process to not be registered"
1585− void $ receiveTimeout 4000000 [ matchAny return ]
1397+ return ()
1587− -- This delay doesn't serve much purpose in the happy path, however if some
1399+ -- Remote process. Test if remote process entry is removed
1588− -- future patch breaks the cooperative behaviour of node controllers viz
1400+ -- from registry when process dies.
1589− -- remote process registration and notification taking place via ncEffectDied,
1401+ remote1 <- testRemote remoteNode
1590− -- there would be the possibility of a race in the test case should we attempt
1402+ runProcess localNode $
1591− -- to evaluate `whereis regName` on node2 right away. In case the name is still
1403+ let waitpoll = do
1592− -- erroneously registered, observing the 20 second delay (or lack of), could at
1404+ w <- whereis "test" :: Process (Maybe ProcessId)
1593− -- least give a hint that something is wrong, and we give up our time slice
1405+ forM_ w (const waitpoll)
1594− -- so that there's a higher change the registrations have been cleaned up
1406+ in do register "test" remote1
1595− -- in either case.
1407+ send remote1 ()
1596− runProcess node2 $ delayUntilMaybeUnregistered nid pid
1408+ waitpoll
1598− regHere <- newEmptyMVar
1410+ return ()
1599− runProcess node2 $ whereis regName >>= liftIO . putMVar regHere
1411+
1600− res <- takeMVar regHere
1412+ -- Many labels. Test if all labels associated with process
1601− case res of
1413+ -- are removed from registry when it dies.
1602− Nothing -> return ()
1414+ remote2 <- testRemote remoteNode
1603− Just pid -> assertBool ("expected Nothing, but got " ++ show pid) False
1415+ runProcess localNode $
1417+ w1 <- whereis "test-3" :: Process (Maybe ProcessId)
1418+ w2 <- whereis "test-4" :: Process (Maybe ProcessId)
1419+ forM_ (w1 <|> w2) (const waitpoll)
1420+ in do register "test-3" remote2
1421+ register "test-4" remote2
1426+{- XXX: waiting including patch for nsend for remote process
1427+ remote3 <- testRemote remoteNode
1428+ remote4 <- testRemote remoteNode
1429+ -- test many labels
1430+ runProcess localNode $ do
1431+ register "test-3" remote3
1432+ reregister "test-3" remote4
1434+ liftIO $ threadDelay 50000 -- XXX: racy
1437+ ProcessMonitorNotification{} <- expect
1441+ -- Test registerRemoteAsync properties. Add a local process to
1442+ -- remote registry and checks that it is removed
1443+ -- when the process dies.
1444+ remote5 <- testRemote remoteNode
1445+ runProcess localNode $ do
1446+ registerRemoteAsync (localNodeId remoteNode) "test" remote5
1448+ match (\(RegisterReply _ True _) -> return ())
1451+ whereisRemoteAsync (localNodeId remoteNode) "test"
1453+ match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1457+ -- Add remote process to remote registry and checks if
1458+ -- entry is removed then process is dead.
1459+ remote6 <- testRemote localNode
1460+ runProcess localNode $ do
1461+ registerRemoteAsync (localNodeId remoteNode) "test" remote6
1463+ match (\(RegisterReply _ True _) -> return ())
1466+ whereisRemoteAsync (localNodeId remoteNode) "test"
1468+ match (\(WhereIsReply _ mr) -> forM_ mr (const waitpoll))
1606− runUntilRegistered nid us = do
1472+ testRemote node = do
1607− whereisRemoteAsync nid regName
1473+ -- test many labels
1608− receiveWait [
1474+ pidBox <- newEmptyMVar
1609− matchIf (\(WhereIsReply n (Just p)) -> n == regName && p == us)
1475+ forkProcess node $ do
1610− (const $ return ())
1476+ us <- getSelfPid
1611− ]
1477+ liftIO $ putMVar pidBox us
1612−
1478+ expect :: Process ()
1613− delayUntilMaybeUnregistered nid p = do
1479+ takeMVar pidBox
1614− whereisRemoteAsync nid regName
1615− res <- receiveTimeout 20000000 {- 20 sec delay -} [
1616− matchIf (\(WhereIsReply n p) -> n == regName && isNothing p)
1617− (const $ return ())
1620− Just () -> return ()
1621− Nothing -> delayUntilMaybeUnregistered nid p
1623− regName = "testRegisterRemote"
1625testUnsafeSend :: TestTransport -> Assertion
1481testUnsafeSend :: TestTransport -> Assertion
1626testUnsafeSend TestTransport{..} = do
1482testUnsafeSend TestTransport{..} = do
@@ -1637,7 +1493,8 @@ testUnsafeSend TestTransport{..} = do
1637 void $ forkProcess localNode $ do
1493 void $ forkProcess localNode $ do
1638 serverPid <- liftIO $ takeMVar serverAddr
1494 serverPid <- liftIO $ takeMVar serverAddr
1639 getSelfPid >>= unsafeSend serverPid
1495 getSelfPid >>= unsafeSend serverPid
1640− expect >>= liftIO . putMVar clientDone
1497+ liftIO $ putMVar clientDone ()
1642 takeMVar clientDone
1499 takeMVar clientDone
@@ -1656,7 +1513,8 @@ testUnsafeUSend TestTransport{..} = do
1656 void $ forkProcess localNode $ do
1513 void $ forkProcess localNode $ do
1657 serverPid <- liftIO $ takeMVar serverAddr
1514 serverPid <- liftIO $ takeMVar serverAddr
1658 getSelfPid >>= unsafeUSend serverPid
1515 getSelfPid >>= unsafeUSend serverPid
1659− expect >>= liftIO . putMVar clientDone
1517+ liftIO $ putMVar clientDone ()
1661 takeMVar clientDone
1519 takeMVar clientDone
@@ -1667,7 +1525,8 @@ testUnsafeNSend TestTransport{..} = do
1667 localNode <- newLocalNode testTransport initRemoteTable
1525 localNode <- newLocalNode testTransport initRemoteTable
1669 pid <- forkProcess localNode $ do
1527 pid <- forkProcess localNode $ do
1670− expect >>= liftIO . putMVar clientDone
1529+ liftIO $ putMVar clientDone ()
1672 void $ runProcess localNode $ do
1531 void $ runProcess localNode $ do
1673 register "foobar" pid
1532 register "foobar" pid
@@ -1685,7 +1544,8 @@ testUnsafeNSendRemote TestTransport{..} = do
1685 _ <- forkProcess localNode1 $ do
1544 _ <- forkProcess localNode1 $ do
1686 getSelfPid >>= register "foobar"
1545 getSelfPid >>= register "foobar"
1687 liftIO $ putMVar clientDone ()
1546 liftIO $ putMVar clientDone ()
1688− expect >>= liftIO . putMVar clientDone
1548+ liftIO $ putMVar clientDone ()
1690 takeMVar clientDone
1550 takeMVar clientDone
1691 void $ runProcess localNode2 $ do
1551 void $ runProcess localNode2 $ do
@@ -1709,7 +1569,7 @@ testUnsafeSendChan TestTransport{..} = do
1709 serverPid <- liftIO $ takeMVar serverAddr
1569 serverPid <- liftIO $ takeMVar serverAddr
1710 (sp, rp) <- newChan
1570 (sp, rp) <- newChan
1711 unsafeSend serverPid sp
1571 unsafeSend serverPid sp
1712− receiveChan rp :: Process ()
1572+ () <- receiveChan rp
1713 liftIO $ putMVar clientDone ()
1573 liftIO $ putMVar clientDone ()
1715 takeMVar clientDone
1575 takeMVar clientDone
@@ -1723,8 +1583,8 @@ testCallLocal TestTransport{..} = do
1723 runProcess node $ do
1583 runProcess node $ do
1724 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1584 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1725 liftIO $ putMVar result r
1585 liftIO $ putMVar result r
1727− takeMVar result >>= assertBool "Expected 'True'"
1586+ True <- takeMVar result
1729 -- Testing that when callLocal is interrupted, the worker is interrupted.
1589 -- Testing that when callLocal is interrupted, the worker is interrupted.
1730 ibox <- newIORef False
1590 ibox <- newIORef False
@@ -1741,9 +1601,10 @@ testCallLocal TestTransport{..} = do
1741 (send keeper ())
1601 (send keeper ())
1742 caller <- expect
1602 caller <- expect
1743 exit caller "test"
1603 exit caller "test"
1744− expect :: Process ()
1604+ () <- expect
1746− readIORef ibox >>= assertBool "Expected 'True'"
1606+ True <- readIORef ibox
1748 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
1609 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
1749 ibox2 <- newIORef False
1610 ibox2 <- newIORef False
@@ -1752,8 +1613,8 @@ testCallLocal TestTransport{..} = do
1752 liftIO $ writeIORef ibox2 $ case r of
1613 liftIO $ writeIORef ibox2 $ case r of
1753 Left (ErrorCall "e") -> True
1614 Left (ErrorCall "e") -> True
1754 _ -> False
1615 _ -> False
1756− readIORef ibox >>= assertBool "Expected 'True'"
1616+ True <- readIORef ibox
1758 -- Test that caller waits for the worker in correct situation
1619 -- Test that caller waits for the worker in correct situation
1759 ibox3 <- newIORef False
1620 ibox3 <- newIORef False
@@ -1770,8 +1631,8 @@ testCallLocal TestTransport{..} = do
1770 liftIO $ putMVar result3 =<< readIORef ibox3
1631 liftIO $ putMVar result3 =<< readIORef ibox3
1771 worker <- expect
1632 worker <- expect
1772 send worker ()
1633 send worker ()
1774− takeMVar result3 >>= assertBool "Expected 'True'"
1634+ True <- takeMVar result3
1776 -- Test that caller waits for the worker in case when caller gets an exception
1637 -- Test that caller waits for the worker in case when caller gets an exception
1777 ibox4 <- newIORef False
1638 ibox4 <- newIORef False
@@ -1787,10 +1648,14 @@ testCallLocal TestTransport{..} = do
1787 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1648 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1788 caller <- expect
1649 caller <- expect
1789 exit caller "hi!"
1650 exit caller "hi!"
1791− takeMVar result4 >>= assertBool "Expected 'True'"
1651+ True <- takeMVar result4
1792 -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1653 -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1794tests :: TestTransport -> IO [Test]
1659tests :: TestTransport -> IO [Test]
1795tests testtrans = return [
1660tests testtrans = return [
1796 testGroup "Basic features" [
1661 testGroup "Basic features" [
@@ -1814,7 +1679,6 @@ tests testtrans = return [
1814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
1679 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
1815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
1680 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
1816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1681 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817− , testCase "ChanLifecycle" (testChanLifecycle testtrans)
1818 , testCase "KillLocal" (testKillLocal testtrans)
1682 , testCase "KillLocal" (testKillLocal testtrans)
1819 , testCase "KillRemote" (testKillRemote testtrans)
1683 , testCase "KillRemote" (testKillRemote testtrans)
1820 , testCase "Die" (testDie testtrans)
1684 , testCase "Die" (testDie testtrans)
@@ -1824,7 +1688,7 @@ tests testtrans = return [
1824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
1688 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
1825 , testCase "ExitLocal" (testExitLocal testtrans)
1689 , testCase "ExitLocal" (testExitLocal testtrans)
1826 , testCase "ExitRemote" (testExitRemote testtrans)
1690 , testCase "ExitRemote" (testExitRemote testtrans)
1827− , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
1691+ , testCase "TestRegistryMonitor" (testRegistryMonitoring testtrans)
1828 , testCase "TextCallLocal" (testCallLocal testtrans)
1692 , testCase "TextCallLocal" (testCallLocal testtrans)
1829 -- Unsafe Primitives
1693 -- Unsafe Primitives
1830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
1694 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
@@ -1877,3 +1741,17 @@ tests testtrans = return [
1877 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1741 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1745+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1746+syncBreakConnection breakConnection nid0 nid1 = do
1748+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1749+ runProcess nid0 $ do
1750+ them <- liftIO $ takeMVar m
1751+ pinger <- spawnLocal $ forever $ send them ()
1752+ _ <- monitorNode (localNodeId nid1)
1753+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1754+ (nodeAddress $ localNodeId nid1)
1755+ NodeMonitorNotification _ _ _ <- expect
1756+ kill pinger "finished"