Ported distributed-process-client-server

Author: LaurentRDC

packages/distributed-process-client-server/distributed-process-client-server.cabal

@@ -87,10 +87,9 @@ test-suite ManagedProcessTests
                    binary >= 0.8 && < 0.9,
                    deepseq,
                    network >= 2.3 && < 3.3,
-                   HUnit >= 1.2 && < 2,
                    stm,
-                   test-framework >= 0.6 && < 0.9,
-                   test-framework-hunit,
+                   tasty >= 1.5 && <1.6,
+                   tasty-hunit >=0.10 && <0.11,
                    transformers,
                    ghc-prim,
                    exceptions
@@ -125,10 +124,9 @@ test-suite PrioritisedProcessTests
                    binary,
                    deepseq,
                    network,
-                   HUnit,
                    stm,
-                   test-framework,
-                   test-framework-hunit,
+                   tasty >= 1.5 && <1.6,
+                   tasty-hunit >=0.10 && <0.11,
                    transformers,
                    ghc-prim,
                    exceptions

packages/distributed-process-client-server/tests/TestManagedProcess.hs

@@ -26,8 +26,8 @@ import MathsDemo
 import Counter
 import qualified SafeCounter as SafeCounter
 
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.HUnit (testCase)
 import TestUtils
 import ManagedProcessCommon
 
@@ -210,13 +210,14 @@ testCounterExceedsLimit result = do
     ]
   stash result (r /= DiedNormal)
 
-tests :: NT.Transport  -> IO [Test]
+tests :: NT.Transport  -> IO TestTree
 tests transport = do
   localNode <- newLocalNode transport initRemoteTable
   scpid <- newEmptyMVar
   _ <- forkProcess localNode $ SafeCounter.startCounter 5 >>= stash scpid
   safeCounter <- takeMVar scpid
-  return [
+  return $ 
+    testGroup "" [
         testGroup "Basic Client/Server Functionality" [
             testCase "basic call with explicit server reply"
             (delayedAssertion

packages/distributed-process-client-server/tests/TestPrioritisedProcess.hs

@@ -38,8 +38,8 @@ import Data.List (isInfixOf)
 import Data.Maybe (isNothing, isJust)
 import Data.Typeable (Typeable)
 
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.HUnit (testCase)
 import TestUtils
 import ManagedProcessCommon
 
@@ -534,10 +534,10 @@ testCallPrioritisation result = do
   let ms = rights st
   stash result $ ms == ["we do prioritise", "the longest", "commands", "first"]
 
-tests :: NT.Transport  -> IO [Test]
+tests :: NT.Transport  -> IO TestTree
 tests transport = do
   localNode <- newLocalNode transport initRemoteTable
-  return [
+  return $ testGroup "" [
         testGroup "basic server functionality matches un-prioritised processes" [
             testCase "basic call with explicit server reply"
             (delayedAssertion

packages/distributed-process-client-server/tests/TestUtils.hs

@@ -18,7 +18,7 @@ import Control.Distributed.Process.Node
 import Control.Distributed.Process.Extras
 import Control.Distributed.Process.Extras.Time
 import Control.Distributed.Process.Extras.Timer
-import Test.Framework (Test, defaultMain)
+import Test.Tasty (TestTree, defaultMain)
 
 import Network.Transport.TCP
 import qualified Network.Transport as NT
@@ -41,7 +41,7 @@ mkNode port = do
   newLocalNode transport1 initRemoteTable
 
 -- | Given a @builder@ function, make and run a test suite on a single transport
-testMain :: (NT.Transport -> IO [Test]) -> IO ()
+testMain :: (NT.Transport -> IO TestTree) -> IO ()
 testMain builder = do
   Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters
   testData <- builder transport