Better treatment of (non)determinism in the tests

grapesy.cabal

@@ -227,7 +227,6 @@ test-suite test-grapesy
 --    , tasty-quickcheck >= 0.10 && < 0.11
     , text             >= 1.2  && < 2.1
     , tls              >= 1.5  && < 1.8
-    , unbounded-delays >= 0.1  && < 0.2
 
 executable demo-client
   import:

src/Network/GRPC/Spec/CustomMetadata.hs

@@ -89,7 +89,7 @@ data CustomMetadata =
 newtype HeaderName = UnsafeHeaderName {
       getHeaderName :: Strict.ByteString
     }
-  deriving stock (Eq)
+  deriving stock (Eq, Ord)
 
 -- | 'Show' instance relies on the 'HeaderName' pattern synonym
 instance Show HeaderName where
@@ -145,7 +145,7 @@ isValidHeaderName bs = and [
 newtype AsciiValue = UnsafeAsciiValue {
       getAsciiValue :: Strict.ByteString
     }
-  deriving stock (Eq)
+  deriving stock (Eq, Ord)
 
 -- | 'Show' instance relies on the 'AsciiValue' pattern synonym
 instance Show AsciiValue where

test-grapesy/Test/Driver/ClientServer.hs

@@ -35,26 +35,26 @@ instance Default ClientServerTest where
       , server = []
       }
 
-testClientServer :: IO ClientServerTest -> IO String
-testClientServer mkTest = do
-    ClientServerTest{config, client, server} <- mkTest
-    mRes <- try $ runTestClientServer config client server
-    case mRes of
-      Left err
-        | Just (testFailure :: HUnitFailure) <- fromException err
-        -> throwIO testFailure
-
-        | isExpectedException config err
-        -> return $ "Got expected error: " ++ show err
-
-        | otherwise
-        -> assertFailure $ concat [
-              "Unexpected exception of type "
-            , case err of
-                SomeException e -> show (typeOf e)
-            , ": "
-            , show err
-            ]
-      Right () ->
-        return ""
+testClientServer :: (forall a. (ClientServerTest -> IO a) -> IO a) -> IO String
+testClientServer withTest =
+    withTest $ \ClientServerTest{config, client, server} -> do
+      mRes <- try $ runTestClientServer config client server
+      case mRes of
+        Left err
+          | Just (testFailure :: HUnitFailure) <- fromException err
+          -> throwIO testFailure
+
+          | isExpectedException config err
+          -> return $ "Got expected error: " ++ show err
+
+          | otherwise
+          -> assertFailure $ concat [
+                "Unexpected exception of type "
+              , case err of
+                  SomeException e -> show (typeOf e)
+              , ": "
+              , show err
+              ]
+        Right () ->
+          return ""