git.iko.soy/distributed-process
on master help sign in
Refactor tests to handle lack of MonadFail on our stack when supporting the latest GHC (tested with 8.6.1)
e191294Tim Watson
distributed-process-tests/src/Control/Distributed/Process/Tests/CH.hs+296−212
compare with master
unifiedsplit
@@ -39,7 +39,7 @@ import Control.Distributed.Process.Internal.Types
39import Control.Distributed.Process.Node
39import Control.Distributed.Process.Node
40import Control.Distributed.Process.Serializable (Serializable)
40import Control.Distributed.Process.Serializable (Serializable)
41
41
42−import Test.HUnit (Assertion, assertFailure)
42+import Test.HUnit (Assertion, assertBool, assertFailure)
43import Test.Framework (Test, testGroup)
43import Test.Framework (Test, testGroup)
44import Test.Framework.Providers.HUnit (testCase)
44import Test.Framework.Providers.HUnit (testCase)
45import Control.Rematch hiding (match)
45import Control.Rematch hiding (match)
@@ -75,12 +75,47 @@ ping = do
75 send partner (Ping self)
75 send partner (Ping self)
76 ping
76 ping
77
77
78+verifyClient :: String -> MVar Bool -> IO ()
79+verifyClient s b = takeMVar b >>= assertBool s
80+
81+expectPing :: MVar Bool -> Process ()
82+expectPing mv = expect >>= liftIO . putMVar mv . checkPing
83+ where
84+ checkPing (Ping _) = True
85+ checkPing _ = False
86+
78-- | Quick and dirty synchronous version of whereisRemoteAsync
87-- | Quick and dirty synchronous version of whereisRemoteAsync
79whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
88whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
80whereisRemote nid string = do
89whereisRemote nid string = do
81 whereisRemoteAsync nid string
90 whereisRemoteAsync nid string
91+ receiveWait [
82− WhereIsReply _ mPid <- expect
92+ match (\(WhereIsReply _ mPid) -> return mPid)
93+ ]
94+
95+verifyWhereIsRemote :: NodeId -> String -> Process ProcessId
96+verifyWhereIsRemote n s = whereisRemote n s >>= maybe (die "remote name not found") return
97+
98+waitForExit :: ProcessId -> Process DiedReason
99+waitForExit pid = monitor pid >>= waitForDown
100+
101+waitForDown :: MonitorRef -> Process DiedReason
102+waitForDown ref =
103+ receiveWait [ matchIf (\(ProcessMonitorNotification ref' _ _) -> ref == ref')
104+ (\(ProcessMonitorNotification _ _ dr) -> return dr) ]
105+
106+syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
107+syncBreakConnection breakConnection nid0 nid1 = do
108+ m <- newEmptyMVar
109+ _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
110+ runProcess nid0 $ do
111+ them <- liftIO $ takeMVar m
112+ pinger <- spawnLocal $ forever $ send them ()
113+ _ <- monitorNode (localNodeId nid1)
114+ liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
115+ (nodeAddress $ localNodeId nid1)
116+ NodeMonitorNotification _ _ _ <- expect
117+ kill pinger "finished"
83− return mPid
118+ return ()
84
119
85data Add = Add ProcessId Double Double deriving (Typeable)
120data Add = Add ProcessId Double Double deriving (Typeable)
86data Divide = Divide ProcessId Double Double deriving (Typeable)
121data Divide = Divide ProcessId Double Double deriving (Typeable)
@@ -155,12 +190,18 @@ monitorTestProcess theirAddr mOrL un reason monitorSetup done =
155 unmonitor ref
190 unmonitor ref
156 liftIO $ putMVar done ()
191 liftIO $ putMVar done ()
157 (False, ref) -> do
192 (False, ref) -> do
193+ receiveWait [
158− ProcessMonitorNotification ref' pid reason' <- expect
194+ match (\(ProcessMonitorNotification ref' pid reason') -> do
195+ liftIO $ do
196+ assertBool "Bad Monitor Signal"
159− True <- return $ Just ref' == ref && pid == theirAddr && mOrL && reason == reason'
197+ (Just ref' == ref && pid == theirAddr &&
198+ mOrL && reason == reason')
160− liftIO $ putMVar done ()
199+ putMVar done ())
200+ ]
161 )
201 )
162 (\(ProcessLinkException pid reason') -> do
202 (\(ProcessLinkException pid reason') -> do
203+ (liftIO $ assertBool "link exception unmatched" $
163− True <- return $ pid == theirAddr && not mOrL && not un && reason == reason'
204+ pid == theirAddr && not mOrL && not un && reason == reason')
164 liftIO $ putMVar done ()
205 liftIO $ putMVar done ()
165 )
206 )
166
207
@@ -191,8 +232,10 @@ testPing TestTransport{..} = do
191 pid <- getSelfPid
232 pid <- getSelfPid
192 replicateM_ numPings $ do
233 replicateM_ numPings $ do
193 send pingServer (Pong pid)
234 send pingServer (Pong pid)
194− Ping _ <- expect
235+ p <- expect
236+ case p of
195− return ()
237+ Ping _ -> return ()
238+ _ -> die "Unexpected message"
196
239
197 putMVar clientDone ()
240 putMVar clientDone ()
198
241
@@ -279,7 +322,7 @@ testMonitorLocalDeadProcess TestTransport{..} mOrL un = do
279 runProcess localNode $ do
322 runProcess localNode $ do
280 monitor theirAddr
323 monitor theirAddr
281 -- wait for the process to die
324 -- wait for the process to die
282− ProcessMonitorNotification _ _ _ <- expect
325+ expect :: Process ProcessMonitorNotification
283 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
326 monitorTestProcess theirAddr mOrL un DiedUnknownId Nothing done
284
327
285 takeMVar done
328 takeMVar done
@@ -353,14 +396,17 @@ testMath TestTransport{..} = do
353 runProcess localNode $ do
396 runProcess localNode $ do
354 pid <- getSelfPid
397 pid <- getSelfPid
355 send mathServer (Add pid 1 2)
398 send mathServer (Add pid 1 2)
356− 3 <- expect :: Process Double
399+ three <- expect :: Process Double
357 send mathServer (Divide pid 8 2)
400 send mathServer (Divide pid 8 2)
358− 4 <- expect :: Process Double
401+ four <- expect :: Process Double
359 send mathServer (Divide pid 8 0)
402 send mathServer (Divide pid 8 0)
360− DivByZero <- expect
403+ divByZ <- expect
361− liftIO $ putMVar clientDone ()
404+ liftIO $ putMVar clientDone (three, four, divByZ)
362
405
363− takeMVar clientDone
406+ res <- takeMVar clientDone
407+ case res of
408+ (3, 4, DivByZero) -> return ()
409+ _ -> error $ "Something went horribly wrong"
364
410
365-- | Send first message (i.e. connect) to an already terminated process
411-- | Send first message (i.e. connect) to an already terminated process
366-- (without monitoring); then send another message to a second process on
412-- (without monitoring); then send another message to a second process on
@@ -388,11 +434,9 @@ testSendToTerminated TestTransport{..} = do
388 pid <- getSelfPid
434 pid <- getSelfPid
389 send server1 "Hi"
435 send server1 "Hi"
390 send server2 (Pong pid)
436 send server2 (Pong pid)
391− Ping pid' <- expect
392− True <- return $ pid' == server2
393− liftIO $ putMVar clientDone ()
437+ expectPing clientDone
394
438
395− takeMVar clientDone
439+ verifyClient "Expected Ping from server" clientDone
396
440
397-- | Test (non-zero) timeout
441-- | Test (non-zero) timeout
398testTimeout :: TestTransport -> Assertion
442testTimeout :: TestTransport -> Assertion
@@ -401,10 +445,10 @@ testTimeout TestTransport{..} = do
401 done <- newEmptyMVar
445 done <- newEmptyMVar
402
446
403 runProcess localNode $ do
447 runProcess localNode $ do
404− Nothing <- receiveTimeout 1000000 [match (\(Add _ _ _) -> return ())]
448+ res <- receiveTimeout 1000000 [match (\Add{} -> return ())]
405− liftIO $ putMVar done ()
449+ liftIO $ putMVar done $ res == Nothing
406
450
407− takeMVar done
451+ verifyClient "Expected receiveTimeout to timeout..." done
408
452
409-- | Test zero timeout
453-- | Test zero timeout
410testTimeout0 :: TestTransport -> Assertion
454testTimeout0 :: TestTransport -> Assertion
@@ -432,10 +476,9 @@ testTimeout0 TestTransport{..} = do
432 -- is not interested in, and then a single message that it wants
476 -- is not interested in, and then a single message that it wants
433 replicateM_ 10000 $ send server "Irrelevant message"
477 replicateM_ 10000 $ send server "Irrelevant message"
434 send server (Pong pid)
478 send server (Pong pid)
435− Ping _ <- expect
436− liftIO $ putMVar clientDone ()
479+ expectPing clientDone
437
480
438− takeMVar clientDone
481+ verifyClient "Expected Ping from server" clientDone
439
482
440-- | Test typed channels
483-- | Test typed channels
441testTypedChannels :: TestTransport -> Assertion
484testTypedChannels :: TestTransport -> Assertion
@@ -458,10 +501,10 @@ testTypedChannels TestTransport{..} = do
458 runProcess localNode $ do
501 runProcess localNode $ do
459 (clientSendPort, rport) <- newChan
502 (clientSendPort, rport) <- newChan
460 sendChan serverSendPort (clientSendPort, 5)
503 sendChan serverSendPort (clientSendPort, 5)
461− False <- receiveChan rport
504+ ch <- receiveChan rport
462− liftIO $ putMVar clientDone ()
505+ liftIO $ putMVar clientDone $ ch == False
463
506
464− takeMVar clientDone
507+ verifyClient "Expected channel to send 'False'" clientDone
465
508
466-- | Test merging receive ports
509-- | Test merging receive ports
467testMergeChannels :: TestTransport -> Assertion
510testMergeChannels :: TestTransport -> Assertion
@@ -484,9 +527,8 @@ testMergeChannels TestTransport{..} = do
484 rs <- mapM charChannel "abc"
527 rs <- mapM charChannel "abc"
485 m <- mergePorts biased rs
528 m <- mergePorts biased rs
486 xs <- replicateM 9 $ receiveChan m
529 xs <- replicateM 9 $ receiveChan m
487− True <- return $ xs == expected
488− liftIO $ putMVar done ()
530+ liftIO $ putMVar done $ xs == expected
489− takeMVar done
531+ verifyClient "Expected single layer merge to match expected ordering" done
490
532
491 -- Two layers of merging
533 -- Two layers of merging
492 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
534 testNested :: LocalNode -> Bool -> Bool -> String -> IO ()
@@ -497,9 +539,8 @@ testMergeChannels TestTransport{..} = do
497 ms <- mapM (mergePorts biasedInner) rss
539 ms <- mapM (mergePorts biasedInner) rss
498 m <- mergePorts biasedOuter ms
540 m <- mergePorts biasedOuter ms
499 xs <- replicateM (9 * 3) $ receiveChan m
541 xs <- replicateM (9 * 3) $ receiveChan m
500− True <- return $ xs == expected
542+ liftIO $ putMVar done $ xs == expected
501− liftIO $ putMVar done ()
543+ verifyClient "Expected nested channels to match expeted ordering" done
502− takeMVar done
503
544
504 -- Test that if no messages are (immediately) available, the scheduler makes no difference
545 -- Test that if no messages are (immediately) available, the scheduler makes no difference
505 testBlocked :: LocalNode -> Bool -> IO ()
546 testBlocked :: LocalNode -> Bool -> IO ()
@@ -508,43 +549,45 @@ testMergeChannels TestTransport{..} = do
508 done <- newEmptyMVar
549 done <- newEmptyMVar
509
550
510 forkProcess localNode $ do
551 forkProcess localNode $ do
511− [sa, sb, sc] <- liftIO $ mapM readMVar vs
552+ ss <- liftIO $ mapM readMVar vs
553+ case ss of
554+ [sa, sb, sc] ->
512− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
555+ mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
513− [ -- a, b, c
556+ [ -- a, b, c
514− (sa, 'a')
557+ (sa, 'a')
515− , (sb, 'b')
558+ , (sb, 'b')
516− , (sc, 'c')
559+ , (sc, 'c')
517− -- a, c, b
560+ -- a, c, b
518− , (sa, 'a')
561+ , (sa, 'a')
519− , (sc, 'c')
562+ , (sc, 'c')
520− , (sb, 'b')
563+ , (sb, 'b')
521− -- b, a, c
564+ -- b, a, c
522− , (sb, 'b')
565+ , (sb, 'b')
523− , (sa, 'a')
566+ , (sa, 'a')
524− , (sc, 'c')
567+ , (sc, 'c')
525− -- b, c, a
568+ -- b, c, a
526− , (sb, 'b')
569+ , (sb, 'b')
527− , (sc, 'c')
570+ , (sc, 'c')
528− , (sa, 'a')
571+ , (sa, 'a')
529− -- c, a, b
572+ -- c, a, b
530− , (sc, 'c')
573+ , (sc, 'c')
531− , (sa, 'a')
574+ , (sa, 'a')
532− , (sb, 'b')
575+ , (sb, 'b')
533− -- c, b, a
576+ -- c, b, a
534− , (sc, 'c')
577+ , (sc, 'c')
535− , (sb, 'b')
578+ , (sb, 'b')
536− , (sa, 'a')
579+ , (sa, 'a')
537− ]
580+ ]
581+ _ -> die "Something went horribly wrong"
538
582
539 forkProcess localNode $ do
583 forkProcess localNode $ do
540 (ss, rs) <- unzip <$> replicateM 3 newChan
584 (ss, rs) <- unzip <$> replicateM 3 newChan
541 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
585 liftIO $ mapM_ (uncurry putMVar) $ zip vs ss
542 m <- mergePorts biased rs
586 m <- mergePorts biased rs
543 xs <- replicateM (6 * 3) $ receiveChan m
587 xs <- replicateM (6 * 3) $ receiveChan m
544− True <- return $ xs == "abcacbbacbcacabcba"
545− liftIO $ putMVar done ()
588+ liftIO $ putMVar done $ xs == "abcacbbacbcacabcba"
546
589
547− takeMVar done
590+ verifyClient "Expected merged ports to match expected ordering" done
548
591
549 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
592 mergePorts :: Serializable a => Bool -> [ReceivePort a] -> Process (ReceivePort a)
550 mergePorts True = mergePortsBiased
593 mergePorts True = mergePortsBiased
@@ -562,8 +605,9 @@ testTerminate TestTransport{..} = do
562 localNode <- newLocalNode testTransport initRemoteTable
605 localNode <- newLocalNode testTransport initRemoteTable
563 runProcess localNode $ do
606 runProcess localNode $ do
564 e <- try terminate :: Process (Either ProcessTerminationException ())
607 e <- try terminate :: Process (Either ProcessTerminationException ())
565− True <- return $ either show show e == show ProcessTerminationException
608+ if either show show e == show ProcessTerminationException
566− return ()
609+ then return ()
610+ else die "Unexpected result from terminate"
567
611
568testMonitorNode :: TestTransport -> Assertion
612testMonitorNode :: TestTransport -> Assertion
569testMonitorNode TestTransport{..} = do
613testMonitorNode TestTransport{..} = do
@@ -574,11 +618,12 @@ testMonitorNode TestTransport{..} = do
574
618
575 runProcess node2 $ do
619 runProcess node2 $ do
576 ref <- monitorNode (localNodeId node1)
620 ref <- monitorNode (localNodeId node1)
621+ receiveWait [
577− NodeMonitorNotification ref' nid DiedDisconnect <- expect
622+ match (\(NodeMonitorNotification ref' nid DiedDisconnect) ->
578− True <- return $ ref == ref' && nid == localNodeId node1
623+ return $ ref == ref' && nid == localNodeId node1)
579− liftIO $ putMVar done ()
624+ ] >>= liftIO . putMVar done
580
625
581− takeMVar done
626+ verifyClient "Expected NodeMonitorNotification with matching ref & nodeId" done
582
627
583testMonitorLiveNode :: TestTransport -> Assertion
628testMonitorLiveNode :: TestTransport -> Assertion
584testMonitorLiveNode TestTransport{..} = do
629testMonitorLiveNode TestTransport{..} = do
@@ -593,15 +638,16 @@ testMonitorLiveNode TestTransport{..} = do
593 liftIO $ putMVar ready ()
638 liftIO $ putMVar ready ()
594 liftIO $ takeMVar readyr
639 liftIO $ takeMVar readyr
595 send p ()
640 send p ()
641+ receiveWait [
596− NodeMonitorNotification ref' nid _ <- expect
642+ match (\(NodeMonitorNotification ref' nid _) ->
597− True <- return $ ref == ref' && nid == localNodeId node1
643+ (return $ ref == ref' && nid == localNodeId node1))
598− liftIO $ putMVar done ()
644+ ] >>= liftIO . putMVar done
599
645
600 takeMVar ready
646 takeMVar ready
601 closeLocalNode node1
647 closeLocalNode node1
602 putMVar readyr ()
648 putMVar readyr ()
603
649
604− takeMVar done
650+ verifyClient "Expected NodeMonitorNotification for LIVE node" done
605
651
606testMonitorChannel :: TestTransport -> Assertion
652testMonitorChannel :: TestTransport -> Assertion
607testMonitorChannel TestTransport{..} = do
653testMonitorChannel TestTransport{..} = do
@@ -611,18 +657,20 @@ testMonitorChannel TestTransport{..} = do
611 pid <- forkProcess node1 $ do
657 pid <- forkProcess node1 $ do
612 sport <- expect :: Process (SendPort ())
658 sport <- expect :: Process (SendPort ())
613 ref <- monitorPort sport
659 ref <- monitorPort sport
614− PortMonitorNotification ref' port' reason <- expect
660+ receiveWait [
615− -- reason might be DiedUnknownId if the receive port is GCed before the
661+ -- reason might be DiedUnknownId if the receive port is GCed before the
616− -- monitor is established (TODO: not sure that this is reasonable)
662+ -- monitor is established (TODO: not sure that this is reasonable)
663+ match (\(PortMonitorNotification ref' port' reason) ->
664+ return $ ref' == ref && port' == sendPortId sport &&
617− return $ ref' == ref && port' == sendPortId sport && (reason == DiedNormal || reason == DiedUnknownId)
665+ (reason == DiedNormal || reason == DiedUnknownId))
618− liftIO $ putMVar gotNotification ()
666+ ] >>= liftIO . putMVar gotNotification
619
667
620 runProcess node2 $ do
668 runProcess node2 $ do
621 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
669 (sport, _) <- newChan :: Process (SendPort (), ReceivePort ())
622 send pid sport
670 send pid sport
623 liftIO $ threadDelay 100000
671 liftIO $ threadDelay 100000
624
672
625− takeMVar gotNotification
673+ verifyClient "Expected PortMonitorNotification" gotNotification
626
674
627testRegistry :: TestTransport -> Assertion
675testRegistry :: TestTransport -> Assertion
628testRegistry TestTransport{..} = do
676testRegistry TestTransport{..} = do
@@ -634,20 +682,28 @@ testRegistry TestTransport{..} = do
634
682
635 runProcess node $ do
683 runProcess node $ do
636 register "ping" pingServer
684 register "ping" pingServer
637− Just pid <- whereis "ping"
685+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
638− True <- return $ pingServer == pid
639 us <- getSelfPid
686 us <- getSelfPid
640 nsend "ping" (Pong us)
687 nsend "ping" (Pong us)
641− Ping pid' <- expect
688+ receiveWait [
642− True <- return $ pingServer == pid'
689+ matchIf (\(Ping pid') -> pingServer == pid') (const $ return ())
643− Left (ProcessRegistrationException "dead" Nothing) <- try $ register "dead" deadProcess
690+ ]
644− Left (ProcessRegistrationException "ping" (Just x)) <- try $ register "ping" deadProcess
691+ checkRegException "dead" Nothing deadProcess
645− True <- return $ x == pingServer
692+ checkRegException "ping" (Just pingServer) deadProcess
646− Left (ProcessRegistrationException "dead" Nothing) <- try $ unregister "dead"
693+ try (unregister "dead") >>= checkReg "dead" Nothing
647 liftIO $ putMVar done ()
694 liftIO $ putMVar done ()
648
695
649 takeMVar done
696 takeMVar done
650
697
698+ where
699+ checkRegException name pid dead =
700+ try (register name dead) >>= checkReg name pid
701+
702+ checkReg name pid res =
703+ case res of
704+ Left (ProcessRegistrationException name pid) -> return ()
705+ _ -> die $ "Unexpected Registration" ++ show res
706+
651testRegistryRemoteProcess :: TestTransport -> Assertion
707testRegistryRemoteProcess :: TestTransport -> Assertion
652testRegistryRemoteProcess TestTransport{..} = do
708testRegistryRemoteProcess TestTransport{..} = do
653 node1 <- newLocalNode testTransport initRemoteTable
709 node1 <- newLocalNode testTransport initRemoteTable
@@ -658,13 +714,13 @@ testRegistryRemoteProcess TestTransport{..} = do
658
714
659 runProcess node2 $ do
715 runProcess node2 $ do
660 register "ping" pingServer
716 register "ping" pingServer
661− Just pid <- whereis "ping"
717+ whereis "ping" >>= liftIO . assertBool "Unexpected ping" . (== Just pingServer)
662− True <- return $ pingServer == pid
663 us <- getSelfPid
718 us <- getSelfPid
664 nsend "ping" (Pong us)
719 nsend "ping" (Pong us)
665− Ping pid' <- expect
720+ receiveWait [
666− True <- return $ pingServer == pid'
721+ matchIf (\(Ping pid') -> pingServer == pid')
667− liftIO $ putMVar done ()
722+ (const $ liftIO $ putMVar done ())
723+ ]
668
724
669 takeMVar done
725 takeMVar done
670
726
@@ -685,12 +741,13 @@ testRemoteRegistry TestTransport{..} = do
685 "ping" == label' && pid == pingServer)
741 "ping" == label' && pid == pingServer)
686 (\(RegisterReply _ _ _) -> return ()) ]
742 (\(RegisterReply _ _ _) -> return ()) ]
687
743
688− Just pid <- whereisRemote nid1 "ping"
744+ pid <- verifyWhereIsRemote nid1 "ping"
689− True <- return $ pingServer == pid
745+ liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
690 us <- getSelfPid
746 us <- getSelfPid
691 nsendRemote nid1 "ping" (Pong us)
747 nsendRemote nid1 "ping" (Pong us)
692− Ping pid' <- expect
748+ receiveWait [
693− True <- return $ pingServer == pid'
749+ match (\(Ping pid') -> return $ pingServer == pid')
750+ ] >>= liftIO . assertBool "Expected Ping with ping server's ProcessId"
694
751
695 -- test that if process was not registered Nothing is returned
752 -- test that if process was not registered Nothing is returned
696 -- in owner field.
753 -- in owner field.
@@ -726,15 +783,15 @@ testRemoteRegistryRemoteProcess TestTransport{..} = do
726 receiveWait [
783 receiveWait [
727 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
784 matchIf (\(RegisterReply label' _ _) -> "ping" == label')
728 (\(RegisterReply _ _ _) -> return ()) ]
785 (\(RegisterReply _ _ _) -> return ()) ]
729− Just pid <- whereisRemote nid1 "ping"
786+ pid <- verifyWhereIsRemote nid1 "ping"
730− True <- return $ pingServer == pid
787+ liftIO $ assertBool "Expected pingServer to match remote name" $ pingServer == pid
731 us <- getSelfPid
788 us <- getSelfPid
732 nsendRemote nid1 "ping" (Pong us)
789 nsendRemote nid1 "ping" (Pong us)
733− Ping pid' <- expect
790+ receiveWait [
734− True <- return $ pingServer == pid'
791+ match (\(Ping pid') -> return $ pingServer == pid')
735− liftIO $ putMVar done ()
792+ ] >>= liftIO . putMVar done
736
793
737− takeMVar done
794+ verifyClient "Expected Ping with ping server's ProcessId" done
738
795
739testSpawnLocal :: TestTransport -> Assertion
796testSpawnLocal :: TestTransport -> Assertion
740testSpawnLocal TestTransport{..} = do
797testSpawnLocal TestTransport{..} = do
@@ -748,15 +805,14 @@ testSpawnLocal TestTransport{..} = do
748 sport <- expect
805 sport <- expect
749 sendChan sport (1234 :: Int)
806 sendChan sport (1234 :: Int)
750
807
751− sport <- spawnChannelLocal $ \rport -> do
808+ sport <- spawnChannelLocal $
752− (1234 :: Int) <- receiveChan rport
809+ \rport -> (receiveChan rport :: Process Int) >>= send us
753− send us ()
754
810
755 send pid sport
811 send pid sport
756− () <- expect
757− liftIO $ putMVar done ()
812+ expect >>= liftIO . putMVar done
758
813
759− takeMVar done
814+ res <- takeMVar done
815+ assertBool "Expected 1234 :: Int" $ res == (1234 :: Int)
760
816
761testSpawnAsyncStrictness :: TestTransport -> Assertion
817testSpawnAsyncStrictness :: TestTransport -> Assertion
762testSpawnAsyncStrictness TestTransport{..} = do
818testSpawnAsyncStrictness TestTransport{..} = do
@@ -785,8 +841,9 @@ testReconnect TestTransport{..} = do
785 liftIO $ putMVar processA us
841 liftIO $ putMVar processA us
786 msg1 <- expect
842 msg1 <- expect
787 msg2 <- expect
843 msg2 <- expect
844+ liftIO $ do
788− True <- return $ msg1 == "message 1" && msg2 == "message 3"
845+ assertBool "messages did not match" $ msg1 == "message 1" && msg2 == "message 3"
789− liftIO $ putMVar sendTestOk ()
846+ putMVar sendTestOk ()
790
847
791 forkProcess node2 $ do
848 forkProcess node2 $ do
792 {-
849 {-
@@ -819,7 +876,7 @@ testReconnect TestTransport{..} = do
819 matchIf (\(RegisterReply label' _ _) -> "a" == label')
876 matchIf (\(RegisterReply label' _ _) -> "a" == label')
820 (\(RegisterReply _ _ _) -> return ()) ]
877 (\(RegisterReply _ _ _) -> return ()) ]
821
878
822− Just _ <- whereisRemote nid1 "a"
879+ _ <- whereisRemote nid1 "a"
823
880
824
881
825 -- Simulate network failure
882 -- Simulate network failure
@@ -838,9 +895,10 @@ testReconnect TestTransport{..} = do
838 (\(RegisterReply _ _ _) -> return ()) ]
895 (\(RegisterReply _ _ _) -> return ()) ]
839
896
840 -- Check
897 -- Check
841− Nothing <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
898+ mPid <- whereisRemote nid1 "a" -- this will fail because the name is removed when the node is disconnected
899+ liftIO $ assertBool "Expected remote name to be lost" $ mPid == Nothing
842− Just _ <- whereisRemote nid1 "b" -- this will suceed because the value is set after thereconnect
900+ verifyWhereIsRemote nid1 "b" -- this will suceed because the value is set after thereconnect
843− Just _ <- whereisRemote nid1 "c"
901+ verifyWhereIsRemote nid1 "c"
844
902
845 liftIO $ putMVar registerTestOk ()
903 liftIO $ putMVar registerTestOk ()
846
904
@@ -881,13 +939,14 @@ testUSend usendPrim TestTransport{..} numMessages = do
881 isSorted _ = True
939 isSorted _ = True
882 -- The list can't be null since there are no failures after sending
940 -- The list can't be null since there are no failures after sending
883 -- the last message.
941 -- the last message.
942+ liftIO $ do
884− True <- return $ isSorted msgs && not (null msgs)
943+ assertBool "Unexpected failure after sending last msg" $ isSorted msgs && not (null msgs)
885− liftIO $ putMVar usendTestOk ()
944+ putMVar usendTestOk ()
886
945
887 forkProcess node2 $ do
946 forkProcess node2 $ do
888 them <- liftIO $ readMVar processA
947 them <- liftIO $ readMVar processA
889 getSelfPid >>= send them
948 getSelfPid >>= send them
890− () <- expect
949+ expect :: Process ()
891 forM_ [1..numMessages] $ \i -> do
950 forM_ [1..numMessages] $ \i -> do
892 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
951 liftIO $ testBreakConnection (nodeAddress nid1) (nodeAddress nid2)
893 usendPrim them i
952 usendPrim them i
@@ -919,14 +978,17 @@ testMatchAny TestTransport{..} = do
919 runProcess localNode $ do
978 runProcess localNode $ do
920 pid <- getSelfPid
979 pid <- getSelfPid
921 send mathServer (Add pid 1 2)
980 send mathServer (Add pid 1 2)
922− 3 <- expect :: Process Double
981+ three <- expect :: Process Double
923 send mathServer (Divide pid 8 2)
982 send mathServer (Divide pid 8 2)
924− 4 <- expect :: Process Double
983+ four <- expect :: Process Double
925 send mathServer (Divide pid 8 0)
984 send mathServer (Divide pid 8 0)
926− DivByZero <- expect
985+ divByZ <- expect
927− liftIO $ putMVar clientDone ()
986+ liftIO $ putMVar clientDone (three, four, divByZ)
928
987
929− takeMVar clientDone
988+ res <- takeMVar clientDone
989+ case res of
990+ (3, 4, DivByZero) -> return ()
991+ _ -> error "Unexpected result"
930
992
931-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
993-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
932-- in between, however we block 'Divide' requests ....
994-- in between, however we block 'Divide' requests ....
@@ -953,12 +1015,13 @@ testMatchAnyHandle TestTransport{..} = do
953 runProcess localNode $ do
1015 runProcess localNode $ do
954 pid <- getSelfPid
1016 pid <- getSelfPid
955 send mathServer (Add pid 1 2)
1017 send mathServer (Add pid 1 2)
956− 3 <- expect :: Process Double
1018+ three <- expect :: Process Double
957 send mathServer (Divide pid 8 2)
1019 send mathServer (Divide pid 8 2)
958− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1020+ res <- (expectTimeout 100000) :: Process (Maybe Double)
959− liftIO $ putMVar clientDone ()
1021+ liftIO $ putMVar clientDone $ three == 3 && res == Nothing
1022+
1023+ verifyClient "Expected Nothing (i.e. timeout)" clientDone
960
1024
961− takeMVar clientDone
962 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
1025 where maybeForward :: ProcessId -> Message -> Process (Maybe ())
963 maybeForward s msg =
1026 maybeForward s msg =
964 handleMessage msg (\m@(Add _ _ _) -> send s m)
1027 handleMessage msg (\m@(Add _ _ _) -> send s m)
@@ -986,8 +1049,10 @@ testMatchAnyNoHandle TestTransport{..} = do
986 Just _ -> die "NONSENSE")
1049 Just _ -> die "NONSENSE")
987 ]
1050 ]
988 -- we *must* have removed the message from our mailbox though!!!
1051 -- we *must* have removed the message from our mailbox though!!!
989− Nothing <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1052+ res <- receiveTimeout 100000 [ match (\(Add _ _ _) -> return ()) ]
1053+ liftIO $ do
1054+ assertBool "Expected timeout!" $ res == Nothing
990− liftIO $ putMVar serverDone ()
1055+ putMVar serverDone ()
991 putMVar addr server
1056 putMVar addr server
992
1057
993 -- Client
1058 -- Client
@@ -1030,14 +1095,21 @@ testMatchAnyIf TestTransport{..} = do
1030 runProcess localNode $ do
1095 runProcess localNode $ do
1031 pid <- getSelfPid
1096 pid <- getSelfPid
1032 send server (pid, "foo")
1097 send server (pid, "foo")
1033− "foo" <- expect
1098+ foo <- expect
1034− send server (pid, "baz")
1099+ -- provoking what would be the wrong ordering is informative here...
1035− "baz" <- expect
1100+
1036 send server (pid, "bar")
1101 send server (pid, "bar")
1037− Nothing <- (expectTimeout 100000) :: Process (Maybe Double)
1102+ bar <- (expectTimeout 100000) :: Process (Maybe String) -- was Double o_O !?
1103+
1104+ send server (pid, "baz")
1105+ baz <- expect
1106+
1038− liftIO $ putMVar clientDone ()
1107+ liftIO $ putMVar clientDone (foo, bar, baz)
1108+
1109+ res <- takeMVar clientDone
1110+ let res' = res == ("foo", Nothing, "baz")
1111+ assertBool "Expected timeout due to type mismatch" res'
1039
1112
1040− takeMVar clientDone
1041 where tryHandleMessage :: Message -> Process (Maybe ())
1113 where tryHandleMessage :: Message -> Process (Maybe ())
1042 tryHandleMessage msg =
1114 tryHandleMessage msg =
1043 handleMessage msg (\(pid :: ProcessId, (m :: String))
1115 handleMessage msg (\(pid :: ProcessId, (m :: String))
@@ -1070,12 +1142,13 @@ testMatchMessageWithUnwrap TestTransport{..} = do
1070 runProcess localNode $ do
1142 runProcess localNode $ do
1071 pid <- getSelfPid
1143 pid <- getSelfPid
1072 send server (pid, wrapMessage ("foo" :: String))
1144 send server (pid, wrapMessage ("foo" :: String))
1073− "foo" <- expect
1145+ foo <- expect
1074 send server (pid, wrapMessage ("baz" :: String))
1146 send server (pid, wrapMessage ("baz" :: String))
1075− "baz" <- expect
1147+ baz <- expect
1076− liftIO $ putMVar clientDone ()
1148+ liftIO $ putMVar clientDone (foo, baz)
1077
1149
1078− takeMVar clientDone
1150+ res <- takeMVar clientDone
1151+ assertBool "Unexpected unwrapped results" $ res == ("foo", "baz")
1079
1152
1080-- Test 'receiveChanTimeout'
1153-- Test 'receiveChanTimeout'
1081testReceiveChanTimeout :: TestTransport -> Assertion
1154testReceiveChanTimeout :: TestTransport -> Assertion
@@ -1093,18 +1166,19 @@ testReceiveChanTimeout TestTransport{..} = do
1093
1166
1094 -- Wait for a message with a delay. No message arrives, we should get
1167 -- Wait for a message with a delay. No message arrives, we should get
1095 -- Nothing after the delay.
1168 -- Nothing after the delay.
1096− Nothing <- receiveChanTimeout 100000 rp
1169+ receiveChanTimeout 100000 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1097
1170
1098 -- Let the sender know that it can send a message.
1171 -- Let the sender know that it can send a message.
1099 liftIO $ putMVar mvSender ()
1172 liftIO $ putMVar mvSender ()
1100
1173
1101 -- Wait for a message with a delay again. Now a message arrives after
1174 -- Wait for a message with a delay again. Now a message arrives after
1102 -- 0.1 seconds
1175 -- 0.1 seconds
1103− Just True <- receiveChanTimeout 20000000 rp
1176+ res <- receiveChanTimeout 20000000 rp >>= maybe (die "Timeout") return
1177+ liftIO $ assertBool "Expected result to be 'True'" res
1104
1178
1105 -- Wait for a message with zero timeout: non-blocking check. No message is
1179 -- Wait for a message with zero timeout: non-blocking check. No message is
1106 -- available, we get Nothing
1180 -- available, we get Nothing
1107− Nothing <- receiveChanTimeout 0 rp
1181+ receiveChanTimeout 0 rp >>= maybe (return ()) (const $ die "Expected Timeout")
1108
1182
1109 -- Let the sender know that it can send a message.
1183 -- Let the sender know that it can send a message.
1110 liftIO $ putMVar mvSender ()
1184 liftIO $ putMVar mvSender ()
@@ -1114,7 +1188,7 @@ testReceiveChanTimeout TestTransport{..} = do
1114 liftIO $ threadDelay 100000
1188 liftIO $ threadDelay 100000
1115 mb <- receiveChanTimeout 0 rp
1189 mb <- receiveChanTimeout 0 rp
1116 case mb of
1190 case mb of
1117− Just b -> do False <- return b; return ()
1191+ Just b -> do liftIO $ assertBool "Unexpected Message" $ not b
1118 _ -> loop
1192 _ -> loop
1119
1193
1120 liftIO $ putMVar done ()
1194 liftIO $ putMVar done ()
@@ -1151,8 +1225,8 @@ testReceiveChanFeatures TestTransport{..} = do
1151
1225
1152 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1226 rp1 <- mergePortsBiased [even <$> rpInt, rpBool]
1153
1227
1154− True <- receiveChan rp1
1228+ receiveChan rp1 >>= liftIO . assertBool "Expected True"
1155− False <- receiveChan rp1
1229+ receiveChan rp1 >>= liftIO . assertBool "Expected False" . not
1156
1230
1157 -- Test Applicative instance
1231 -- Test Applicative instance
1158
1232
@@ -1161,7 +1235,7 @@ testReceiveChanFeatures TestTransport{..} = do
1161
1235
1162 let rp2 = pure (+) <*> rpInt <*> rpInt
1236 let rp2 = pure (+) <*> rpInt <*> rpInt
1163
1237
1164− 7 <- receiveChan rp2
1238+ receiveChan rp2 >>= liftIO . assertBool "Expected 7" . (== 7)
1165
1239
1166 -- Test Alternative instance
1240 -- Test Alternative instance
1167
1241
@@ -1170,8 +1244,8 @@ testReceiveChanFeatures TestTransport{..} = do
1170
1244
1171 let rp3 = (even <$> rpInt) <|> rpBool
1245 let rp3 = (even <$> rpInt) <|> rpBool
1172
1246
1173− False <- receiveChan rp3
1247+ receiveChan rp3 >>= liftIO . assertBool "Expected False" . not
1174− True <- receiveChan rp3
1248+ receiveChan rp3 >>= liftIO . assertBool "Expected True"
1175
1249
1176 -- Test Monad instance
1250 -- Test Monad instance
1177
1251
@@ -1185,8 +1259,8 @@ testReceiveChanFeatures TestTransport{..} = do
1185 then rpInt
1259 then rpInt
1186 else return 7
1260 else return 7
1187
1261
1188− 5 <- receiveChan rp4
1262+ receiveChan rp4 >>= liftIO . assertBool "Expected 5" . (== 5)
1189− 7 <- receiveChan rp4
1263+ receiveChan rp4 >>= liftIO . assertBool "Expected 7" . (== 7)
1190
1264
1191 liftIO $ putMVar done ()
1265 liftIO $ putMVar done ()
1192
1266
@@ -1195,7 +1269,6 @@ testReceiveChanFeatures TestTransport{..} = do
1195testKillLocal :: TestTransport -> Assertion
1269testKillLocal :: TestTransport -> Assertion
1196testKillLocal TestTransport{..} = do
1270testKillLocal TestTransport{..} = do
1197 localNode <- newLocalNode testTransport initRemoteTable
1271 localNode <- newLocalNode testTransport initRemoteTable
1198− done <- newEmptyMVar
1199
1272
1200 pid <- forkProcess localNode $ do
1273 pid <- forkProcess localNode $ do
1201 liftIO $ threadDelay 1000000
1274 liftIO $ threadDelay 1000000
@@ -1204,17 +1277,18 @@ testKillLocal TestTransport{..} = do
1204 ref <- monitor pid
1277 ref <- monitor pid
1205 us <- getSelfPid
1278 us <- getSelfPid
1206 kill pid "TestKill"
1279 kill pid "TestKill"
1207− ProcessMonitorNotification ref' pid' (DiedException ex) <- expect
1280+ mn <- expect
1281+ case mn of
1282+ ProcessMonitorNotification ref' pid' (DiedException ex) ->
1208− True <- return $ ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill"
1283+ case ref == ref' && pid == pid' && ex == "killed-by=" ++ show us ++ ",reason=TestKill" of
1209− liftIO $ putMVar done ()
1284+ True -> return ()
1210−
1285+ False -> die "Invalid ProcessMonitorNotification received"
1211− takeMVar done
1286+ _ -> die "Something went horribly wrong"
1212
1287
1213testKillRemote :: TestTransport -> Assertion
1288testKillRemote :: TestTransport -> Assertion
1214testKillRemote TestTransport{..} = do
1289testKillRemote TestTransport{..} = do
1215 node1 <- newLocalNode testTransport initRemoteTable
1290 node1 <- newLocalNode testTransport initRemoteTable
1216 node2 <- newLocalNode testTransport initRemoteTable
1291 node2 <- newLocalNode testTransport initRemoteTable
1217− done <- newEmptyMVar
1218
1292
1219 pid <- forkProcess node1 $ do
1293 pid <- forkProcess node1 $ do
1220 liftIO $ threadDelay 1000000
1294 liftIO $ threadDelay 1000000
@@ -1223,11 +1297,17 @@ testKillRemote TestTransport{..} = do
1223 ref <- monitor pid
1297 ref <- monitor pid
1224 us <- getSelfPid
1298 us <- getSelfPid
1225 kill pid "TestKill"
1299 kill pid "TestKill"
1300+ mn <- expect
1301+ case mn of
1226− ProcessMonitorNotification ref' pid' (DiedException reason) <- expect
1302+ ProcessMonitorNotification ref' pid' (DiedException reason) ->
1227− True <- return $ ref == ref' && pid == pid' && reason == "killed-by=" ++ show us ++ ",reason=TestKill"
1303+ case (ref == ref', pid == pid', reason == "killed-by=" ++ show us ++ ",reason=TestKill") of
1228− liftIO $ putMVar done ()
1304+ (True, True, True) -> return ()
1229−
1305+ (a, b, c) -> do
1230− takeMVar done
1306+ let a' = if a then "" else "Invalid ref"
1307+ let b' = if b then "" else "Invalid pid"
1308+ let c' = if c then "" else "Invalid message"
1309+ die $ unwords [a', b', c']
1310+ _ -> die "Received unexpected message"
1231
1311
1232testCatchesExit :: TestTransport -> Assertion
1312testCatchesExit :: TestTransport -> Assertion
1233testCatchesExit TestTransport{..} = do
1313testCatchesExit TestTransport{..} = do
@@ -1253,7 +1333,10 @@ testHandleMessageIf TestTransport{..} = do
1253 self <- getSelfPid
1333 self <- getSelfPid
1254 send self (5 :: Integer, 10 :: Integer)
1334 send self (5 :: Integer, 10 :: Integer)
1255 msg <- receiveWait [ matchMessage return ]
1335 msg <- receiveWait [ matchMessage return ]
1256− Nothing <- handleMessageIf msg (\() -> True) (\() -> die $ "whoops")
1336+ handleMessageIf msg
1337+ (\() -> True)
1338+ (\() -> die "whoops") >>= maybe (return ())
1339+ (const $ die "Expected Mismatch")
1257 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1340 handleMessageIf msg (\(x :: Integer, y :: Integer) -> x == 5 && y == 10)
1258 (\input -> liftIO $ putMVar done input)
1341 (\input -> liftIO $ putMVar done input)
1259 return ()
1342 return ()
@@ -1298,8 +1381,11 @@ testDie TestTransport{..} = do
1298 (die ("foobar", 123 :: Int))
1381 (die ("foobar", 123 :: Int))
1299 `catchExit` \_from reason -> do
1382 `catchExit` \_from reason -> do
1300 -- TODO: should verify that 'from' has the right value
1383 -- TODO: should verify that 'from' has the right value
1301− True <- return $ reason == ("foobar", 123 :: Int)
1384+ let res = reason == ("foobar", 123 :: Int)
1302 liftIO $ putMVar done ()
1385 liftIO $ putMVar done ()
1386+ if res
1387+ then return ()
1388+ else die "Something went horribly wrong"
1303
1389
1304 takeMVar done
1390 takeMVar done
1305
1391
@@ -1313,8 +1399,11 @@ testPrettyExit TestTransport{..} = do
1313 `catch` \ex@(ProcessExitException from _) ->
1399 `catch` \ex@(ProcessExitException from _) ->
1314 let expected = "exit-from=" ++ (show from)
1400 let expected = "exit-from=" ++ (show from)
1315 in do
1401 in do
1316− True <- return $ (show ex) == expected
1402+ let res = (show ex) == expected
1317 liftIO $ putMVar done ()
1403 liftIO $ putMVar done ()
1404+ if res
1405+ then return ()
1406+ else die "Something went horribly wrong"
1318
1407
1319 takeMVar done
1408 takeMVar done
1320
1409
@@ -1330,17 +1419,26 @@ testExitLocal TestTransport{..} = do
1330 pid <- forkProcess localNode $ do
1419 pid <- forkProcess localNode $ do
1331 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1420 (liftIO (putMVar handlerSetUp ()) >> expect) `catchExit` \_from reason -> do
1332 -- TODO: should verify that 'from' has the right value
1421 -- TODO: should verify that 'from' has the right value
1333− True <- return $ reason == "TestExit"
1422+ res <- return $ reason == "TestExit"
1334 liftIO $ putMVar supervisedDone ()
1423 liftIO $ putMVar supervisedDone ()
1424+ if res
1425+ then return ()
1426+ else die "Something went horribly wrong"
1335
1427
1336 runProcess localNode $ do
1428 runProcess localNode $ do
1337 liftIO $ takeMVar handlerSetUp
1429 liftIO $ takeMVar handlerSetUp
1338 ref <- monitor pid
1430 ref <- monitor pid
1339 exit pid "TestExit"
1431 exit pid "TestExit"
1340 -- This time the client catches the exception, so it dies normally
1432 -- This time the client catches the exception, so it dies normally
1433+ mn <- expect
1434+ case mn of
1341− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1435+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1342− True <- return $ ref == ref' && pid == pid'
1436+ let res = ref == ref' && pid == pid'
1343− liftIO $ putMVar supervisorDone ()
1437+ liftIO $ putMVar supervisorDone ()
1438+ if res
1439+ then return ()
1440+ else die "Something went horribly wrong"
1441+ _ -> die "Something went horribly wrong"
1344
1442
1345 takeMVar supervisedDone
1443 takeMVar supervisedDone
1346 takeMVar supervisorDone
1444 takeMVar supervisorDone
@@ -1356,15 +1454,24 @@ testExitRemote TestTransport{..} = do
1356 (receiveWait [] :: Process ()) -- block forever
1454 (receiveWait [] :: Process ()) -- block forever
1357 `catchExit` \_from reason -> do
1455 `catchExit` \_from reason -> do
1358 -- TODO: should verify that 'from' has the right value
1456 -- TODO: should verify that 'from' has the right value
1359− True <- return $ reason == "TestExit"
1457+ res <- return $ reason == "TestExit"
1360 liftIO $ putMVar supervisedDone ()
1458 liftIO $ putMVar supervisedDone ()
1459+ if res
1460+ then return ()
1461+ else die "Something went horribly wrong"
1361
1462
1362 runProcess node2 $ do
1463 runProcess node2 $ do
1363 ref <- monitor pid
1464 ref <- monitor pid
1364 exit pid "TestExit"
1465 exit pid "TestExit"
1466+ mn <- expect
1467+ case mn of
1365− ProcessMonitorNotification ref' pid' DiedNormal <- expect
1468+ ProcessMonitorNotification ref' pid' DiedNormal -> do
1366− True <- return $ ref == ref' && pid == pid'
1469+ res' <- return $ ref == ref' && pid == pid'
1367− liftIO $ putMVar supervisorDone ()
1470+ liftIO $ putMVar supervisorDone ()
1471+ if res'
1472+ then return ()
1473+ else die "Something went horribly wrong"
1474+ _ -> die "Something went horribly wrong"
1368
1475
1369 takeMVar supervisedDone
1476 takeMVar supervisedDone
1370 takeMVar supervisorDone
1477 takeMVar supervisorDone
@@ -1384,8 +1491,7 @@ testUnsafeSend TestTransport{..} = do
1384 void $ forkProcess localNode $ do
1491 void $ forkProcess localNode $ do
1385 serverPid <- liftIO $ takeMVar serverAddr
1492 serverPid <- liftIO $ takeMVar serverAddr
1386 getSelfPid >>= unsafeSend serverPid
1493 getSelfPid >>= unsafeSend serverPid
1387− () <- expect
1388− liftIO $ putMVar clientDone ()
1494+ expect >>= liftIO . putMVar clientDone
1389
1495
1390 takeMVar clientDone
1496 takeMVar clientDone
1391
1497
@@ -1404,8 +1510,7 @@ testUnsafeUSend TestTransport{..} = do
1404 void $ forkProcess localNode $ do
1510 void $ forkProcess localNode $ do
1405 serverPid <- liftIO $ takeMVar serverAddr
1511 serverPid <- liftIO $ takeMVar serverAddr
1406 getSelfPid >>= unsafeUSend serverPid
1512 getSelfPid >>= unsafeUSend serverPid
1407− () <- expect
1408− liftIO $ putMVar clientDone ()
1513+ expect >>= liftIO . putMVar clientDone
1409
1514
1410 takeMVar clientDone
1515 takeMVar clientDone
1411
1516
@@ -1416,8 +1521,7 @@ testUnsafeNSend TestTransport{..} = do
1416 localNode <- newLocalNode testTransport initRemoteTable
1521 localNode <- newLocalNode testTransport initRemoteTable
1417
1522
1418 pid <- forkProcess localNode $ do
1523 pid <- forkProcess localNode $ do
1419− () <- expect
1420− liftIO $ putMVar clientDone ()
1524+ expect >>= liftIO . putMVar clientDone
1421
1525
1422 void $ runProcess localNode $ do
1526 void $ runProcess localNode $ do
1423 register "foobar" pid
1527 register "foobar" pid
@@ -1435,8 +1539,7 @@ testUnsafeNSendRemote TestTransport{..} = do
1435 _ <- forkProcess localNode1 $ do
1539 _ <- forkProcess localNode1 $ do
1436 getSelfPid >>= register "foobar"
1540 getSelfPid >>= register "foobar"
1437 liftIO $ putMVar clientDone ()
1541 liftIO $ putMVar clientDone ()
1438− () <- expect
1439− liftIO $ putMVar clientDone ()
1542+ expect >>= liftIO . putMVar clientDone
1440
1543
1441 takeMVar clientDone
1544 takeMVar clientDone
1442 void $ runProcess localNode2 $ do
1545 void $ runProcess localNode2 $ do
@@ -1460,7 +1563,7 @@ testUnsafeSendChan TestTransport{..} = do
1460 serverPid <- liftIO $ takeMVar serverAddr
1563 serverPid <- liftIO $ takeMVar serverAddr
1461 (sp, rp) <- newChan
1564 (sp, rp) <- newChan
1462 unsafeSend serverPid sp
1565 unsafeSend serverPid sp
1463− () <- receiveChan rp
1566+ receiveChan rp :: Process ()
1464 liftIO $ putMVar clientDone ()
1567 liftIO $ putMVar clientDone ()
1465
1568
1466 takeMVar clientDone
1569 takeMVar clientDone
@@ -1474,8 +1577,8 @@ testCallLocal TestTransport{..} = do
1474 runProcess node $ do
1577 runProcess node $ do
1475 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1578 r <- (/=) <$> getSelfPid <*> callLocal getSelfPid
1476 liftIO $ putMVar result r
1579 liftIO $ putMVar result r
1580+
1477− True <- takeMVar result
1581+ takeMVar result >>= assertBool "Expected 'True'"
1478− return ()
1479
1582
1480 -- Testing that when callLocal is interrupted, the worker is interrupted.
1583 -- Testing that when callLocal is interrupted, the worker is interrupted.
1481 ibox <- newIORef False
1584 ibox <- newIORef False
@@ -1492,10 +1595,9 @@ testCallLocal TestTransport{..} = do
1492 (send keeper ())
1595 (send keeper ())
1493 caller <- expect
1596 caller <- expect
1494 exit caller "test"
1597 exit caller "test"
1495− () <- expect
1598+ expect :: Process ()
1496− return ()
1599+
1497− True <- readIORef ibox
1600+ readIORef ibox >>= assertBool "Expected 'True'"
1498− return ()
1499
1601
1500 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
1602 -- Testing that when the worker raises an exception, the exception is propagated to the parent.
1501 ibox2 <- newIORef False
1603 ibox2 <- newIORef False
@@ -1504,8 +1606,8 @@ testCallLocal TestTransport{..} = do
1504 liftIO $ writeIORef ibox2 $ case r of
1606 liftIO $ writeIORef ibox2 $ case r of
1505 Left (ErrorCall "e") -> True
1607 Left (ErrorCall "e") -> True
1506 _ -> False
1608 _ -> False
1609+
1507− True <- readIORef ibox
1610+ readIORef ibox >>= assertBool "Expected 'True'"
1508− return ()
1509
1611
1510 -- Test that caller waits for the worker in correct situation
1612 -- Test that caller waits for the worker in correct situation
1511 ibox3 <- newIORef False
1613 ibox3 <- newIORef False
@@ -1522,8 +1624,8 @@ testCallLocal TestTransport{..} = do
1522 liftIO $ putMVar result3 =<< readIORef ibox3
1624 liftIO $ putMVar result3 =<< readIORef ibox3
1523 worker <- expect
1625 worker <- expect
1524 send worker ()
1626 send worker ()
1627+
1525− True <- takeMVar result3
1628+ takeMVar result3 >>= assertBool "Expected 'True'"
1526− return ()
1527
1629
1528 -- Test that caller waits for the worker in case when caller gets an exception
1630 -- Test that caller waits for the worker in case when caller gets an exception
1529 ibox4 <- newIORef False
1631 ibox4 <- newIORef False
@@ -1539,13 +1641,9 @@ testCallLocal TestTransport{..} = do
1539 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1641 `finally` (liftIO $ putMVar result4 =<< readIORef ibox4)
1540 caller <- expect
1642 caller <- expect
1541 exit caller "hi!"
1643 exit caller "hi!"
1542− True <- takeMVar result4
1543− return ()
1544− -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1545−
1546−
1547−
1548
1644
1645+ takeMVar result4 >>= assertBool "Expected 'True'"
1646+ -- XXX: Testing that when mask_ $ callLocal p runs p in masked state.
1549
1647
1550tests :: TestTransport -> IO [Test]
1648tests :: TestTransport -> IO [Test]
1551tests testtrans = return [
1649tests testtrans = return [
@@ -1631,17 +1729,3 @@ tests testtrans = return [
1631 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1729 , testCase "MonitorUnreachable" (testMonitorUnreachable testtrans True False)
1632 ]
1730 ]
1633 ]
1731 ]
1634−
1635−syncBreakConnection :: (NT.EndPointAddress -> NT.EndPointAddress -> IO ()) -> LocalNode -> LocalNode -> IO ()
1636−syncBreakConnection breakConnection nid0 nid1 = do
1637− m <- newEmptyMVar
1638− _ <- forkProcess nid1 $ getSelfPid >>= liftIO . putMVar m
1639− runProcess nid0 $ do
1640− them <- liftIO $ takeMVar m
1641− pinger <- spawnLocal $ forever $ send them ()
1642− _ <- monitorNode (localNodeId nid1)
1643− liftIO $ breakConnection (nodeAddress $ localNodeId nid0)
1644− (nodeAddress $ localNodeId nid1)
1645− NodeMonitorNotification _ _ _ <- expect
1646− kill pinger "finished"
1647− return ()
distributed-process-tests/src/Control/Distributed/Process/Tests/Closure.hs+31−23
@@ -412,29 +412,34 @@ testSpawnSupervised TestTransport{..} rtable = do
412 throw supervisorDeath
412 throw supervisorDeath
413
413
414 forkProcess node2 $ do
414 forkProcess node2 $ do
415− [super, child] <- liftIO $ mapM readMVar [superPid, childPid]
415+ res <- liftIO $ mapM readMVar [superPid, childPid]
416− ref <- monitor child
417− self <- getSelfPid
418− let waitForMOrL = do
419− liftIO $ threadDelay 10000
420− mpinfo <- getProcessInfo child
421− case mpinfo of
422− Nothing -> waitForMOrL
423− Just pinfo ->
424− unless (isJust $ lookup self (infoMonitors pinfo)) waitForMOrL
425− waitForMOrL
426− liftIO $ putMVar linkUp ()
427− -- because monitor message was sent before message to process
428− -- we hope that it will be processed before
429− res <- expect
430 case res of
416 case res of
417+ [super, child] -> do
418+ ref <- monitor child
419+ self <- getSelfPid
420+ let waitForMOrL = do
421+ liftIO $ threadDelay 10000
422+ mpinfo <- getProcessInfo child
423+ case mpinfo of
424+ Nothing -> waitForMOrL
425+ Just pinfo ->
426+ unless (isJust $ lookup self (infoMonitors pinfo)) waitForMOrL
427+ waitForMOrL
428+ liftIO $ putMVar linkUp ()
429+ -- because monitor message was sent before message to process
430+ -- we hope that it will be processed before
431+ res' <- expect
432+ case res' of
431− (ProcessMonitorNotification ref' pid' (DiedException e)) ->
433+ (ProcessMonitorNotification ref' pid' (DiedException e)) ->
432− if (ref' == ref && pid' == child &&
434+ if (ref' == ref && pid' == child &&
433− e == show (ProcessLinkException super
435+ e == show (ProcessLinkException super
434− (DiedException (show supervisorDeath))))
436+ (DiedException (show supervisorDeath))))
435− then liftIO $ putMVar thirdProcessDone ()
437+ then liftIO $ putMVar thirdProcessDone ()
436− else error "Something went horribly wrong"
438+ else error "Something went horribly wrong"
437− _ -> error "Something went horribly wrong"
439+ _ -> error "Something went horribly wrong"
440+
441+ _ -> die $ "Something went horribly wrong"
442+
438 takeMVar thirdProcessDone
443 takeMVar thirdProcessDone
439 where
444 where
440 supervisorDeath :: IOException
445 supervisorDeath :: IOException
@@ -505,8 +510,11 @@ testFib TestTransport{..} rtable = do
505 forkProcess (head nodes) $ do
510 forkProcess (head nodes) $ do
506 (sport, rport) <- newChan
511 (sport, rport) <- newChan
507 spawnLocal $ dfib (map localNodeId nodes, sport, 10)
512 spawnLocal $ dfib (map localNodeId nodes, sport, 10)
508− 55 <- receiveChan rport :: Process Integer
513+ ff <- receiveChan rport :: Process Integer
509 liftIO $ putMVar done ()
514 liftIO $ putMVar done ()
515+ if ff /= 55
516+ then die $ "Something went horribly wrong"
517+ else return ()
510
518
511 takeMVar done
519 takeMVar done
512
520