Add test for #257, improve testing

The problem is fixed in latest `http2`
(`7036a3429fb08bfcd5947230c37d1f3e63dfb3a6`).  See
kazu-yamamoto/http2#151 for the `http2` bug report.

Closes #257.

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240708
+# version: 0.19.20241121
 #
-# REGENDATA ("0.19.20240708",["github","cabal.project.ci"])
+# REGENDATA ("0.19.20241121",["github","cabal.project.ci"])
 #
 name: Haskell-CI
 on:
@@ -64,17 +64,30 @@ jobs:
             allow-failure: false
       fail-fast: false
     steps:
-      - name: apt
+      - name: apt-get install
         run: |
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
+          apt-get install -y libsnappy-dev protobuf-compiler
+      - name: Install GHCup
+        run: |
           mkdir -p "$HOME/.ghcup/bin"
           curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
-          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+      - name: Install cabal-install
+        run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
-          apt-get update
-          apt-get install -y libsnappy-dev protobuf-compiler
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (GHCup)
+        if: matrix.setup-method == 'ghcup'
+        run: |
+          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -85,21 +98,12 @@ jobs:
           echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
           echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
-          HCDIR=/opt/$HCKIND/$HCVER
-          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
-          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
-          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
-          echo "HC=$HC" >> "$GITHUB_ENV"
-          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
           echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
-          echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -227,6 +231,11 @@ jobs:
           allow-newer: proto-lens:base
           allow-newer: proto-lens-runtime:base
 
+          source-repository-package
+            type:     git
+            location: https://github.com/edsko/http2
+            tag:      a38646dee7e77e826cc218d45a2818a86959cf23
+
           package grpc-spec
             tests:       True
             flags:       +snappy
@@ -235,7 +244,7 @@ jobs:
           package grapesy
             tests:       True
             benchmarks:  True
-            flags:       +build-demo +build-stress-test 
+            flags:       +build-demo +build-stress-test
             ghc-options: -Werror
 
           package quickstart-tutorial
@@ -313,8 +322,8 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v4
         if: always()
+        uses: actions/cache/save@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store

cabal.project

@@ -1,4 +1,4 @@
-packages: 
+packages:
     ./grpc-spec
   , ./grapesy
   , ./tutorials/quickstart
@@ -9,14 +9,19 @@ packages:
   , ./tutorials/conduit
   , ./tutorials/trailers-only
 
+source-repository-package
+  type: git
+  location: https://github.com/edsko/http2
+  tag: a38646dee7e77e826cc218d45a2818a86959cf23
+
 package grpc-spec
   tests: True
   flags: +snappy
 
 package grapesy
   tests: True
   benchmarks: True
-  flags: +build-demo +build-stress-test 
+  flags: +build-demo +build-stress-test
 
 --
 -- ghc 9.10

cabal.project.ci

@@ -1,4 +1,4 @@
-packages: 
+packages:
     ./grpc-spec
   , ./grapesy
   , ./tutorials/quickstart
@@ -9,6 +9,11 @@ packages:
   , ./tutorials/conduit
   , ./tutorials/trailers-only
 
+source-repository-package
+  type: git
+  location: https://github.com/edsko/http2
+  tag: a38646dee7e77e826cc218d45a2818a86959cf23
+
 package grpc-spec
   tests: True
   flags: +snappy
@@ -17,7 +22,7 @@ package grpc-spec
 package grapesy
   tests: True
   benchmarks: True
-  flags: +build-demo +build-stress-test 
+  flags: +build-demo +build-stress-test
   ghc-options: -Werror
 
 package quickstart-tutorial

grapesy/grapesy.cabal

@@ -48,6 +48,7 @@ common lang
       DataKinds
       DeriveAnyClass
       DeriveFunctor
+      DeriveGeneric
       DeriveTraversable
       DerivingStrategies
       DerivingVia
@@ -175,7 +176,7 @@ library
       --
       -- Other versions should be tested against the full grapesy test suite
       -- (regular tests and stress tests).
-    , http2 == 5.3.5
+    , http2 == 5.3.7
 
 test-suite test-record-dot
   import:         lang, common-executable-flags
@@ -228,6 +229,7 @@ test-suite test-grapesy
       Test.Sanity.EndOfStream
       Test.Sanity.Exception
       Test.Sanity.Interop
+      Test.Sanity.Reclamation
       Test.Sanity.StreamingType.CustomFormat
       Test.Sanity.StreamingType.NonStreaming
       Test.Util
@@ -301,6 +303,7 @@ test-suite test-stress
     , exceptions
     , http2
     , network
+    , text
     , tls
 
   build-depends:
@@ -311,8 +314,10 @@ test-suite test-stress
     , filepath             >= 1.4.2.1 && < 1.6
     , ghc-events           >= 0.17    && < 0.20
     , optparse-applicative >= 0.16    && < 0.19
+    , pretty-show          >= 1.10    && < 1.11
     , process              >= 1.6.12  && < 1.7
     , random               >= 1.2     && < 1.3
+    , temporary            >= 1.3     && < 1.4
 
   if !flag(build-stress-test)
     buildable:

grapesy/interop/Interop/Client/TestCase/SpecialStatusMessage.hs

@@ -7,7 +7,7 @@ import Data.Text (Text)
 import Network.GRPC.Client
 import Network.GRPC.Common
 import Network.GRPC.Common.Protobuf
-import Network.GRPC.Spec.Serialization (buildGrpcStatus)
+import Network.GRPC.Spec (fromGrpcStatus)
 
 import Interop.Client.Connect
 import Interop.Cmdline
@@ -30,7 +30,7 @@ runTest cmdline = do
     echoStatus :: Proto EchoStatus
     echoStatus =
         defMessage
-          & #code    .~ fromIntegral (buildGrpcStatus $ GrpcError GrpcUnknown)
+          & #code    .~ fromIntegral (fromGrpcStatus $ GrpcError GrpcUnknown)
           & #message .~ statusMessage
 
     statusMessage :: Text

grapesy/interop/Interop/Client/TestCase/StatusCodeAndMessage.hs

@@ -7,7 +7,7 @@ import Data.Text (Text)
 import Network.GRPC.Client
 import Network.GRPC.Common
 import Network.GRPC.Common.Protobuf
-import Network.GRPC.Spec.Serialization (buildGrpcStatus)
+import Network.GRPC.Spec (fromGrpcStatus)
 
 import Interop.Client.Connect
 import Interop.Cmdline
@@ -39,7 +39,7 @@ runTest cmdline = do
     echoStatus :: Proto EchoStatus
     echoStatus =
         defMessage
-          & #code    .~ fromIntegral (buildGrpcStatus $ GrpcError GrpcUnknown)
+          & #code    .~ fromIntegral (fromGrpcStatus $ GrpcError GrpcUnknown)
           & #message .~ statusMessage
 
     statusMessage :: Text

grapesy/interop/Interop/Server/Common.hs

@@ -12,7 +12,7 @@ import Control.Exception
 import Network.GRPC.Common
 import Network.GRPC.Common.Protobuf
 import Network.GRPC.Server
-import Network.GRPC.Spec.Serialization (parseGrpcStatus)
+import Network.GRPC.Spec (toGrpcStatus)
 
 import Interop.Util.Exceptions
 
@@ -54,7 +54,7 @@ constructResponseMetadata call = do
 -- See <https://github.com/grpc/grpc/blob/master/doc/interop-test-descriptions.md#status_code_and_message>
 echoStatus :: Proto EchoStatus -> IO ()
 echoStatus status =
-    case parseGrpcStatus code of
+    case toGrpcStatus code of
       Just GrpcOk ->
         return ()
       Just (GrpcError err) ->

grapesy/src/Network/GRPC/Server/Context.hs

@@ -109,4 +109,4 @@ defaultServerTopLevel h unmask req resp =
 -- See <https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0330-exception-backtraces.rst>.
 defaultServerExceptionToClient :: SomeException -> IO (Maybe Text)
 defaultServerExceptionToClient (SomeException e) =
-    return $ Just (Text.pack $ displayException e)
+    return $ Just (Text.pack $ "Server-side exception: " ++ displayException e)

grapesy/src/Network/GRPC/Server/Run.hs

@@ -30,6 +30,7 @@ import Control.Concurrent.STM
 import Control.Exception
 import Control.Monad
 import Data.Default
+import GHC.Generics (Generic)
 import Network.HTTP2.Server qualified as HTTP2
 import Network.HTTP2.TLS.Server qualified as HTTP2.TLS
 import Network.Run.TCP qualified as Run
@@ -62,7 +63,7 @@ data ServerConfig = ServerConfig {
       -- Set to 'Nothing' to disable.
     , serverSecure :: Maybe SecureConfig
     }
-  deriving (Show)
+  deriving stock (Show, Generic)
 
 -- | Offer insecure connection (no TLS)
 data InsecureConfig = InsecureConfig {
@@ -76,7 +77,7 @@ data InsecureConfig = InsecureConfig {
       -- 'getInsecureSocket' for a way to figure out what this port actually is.
     , insecurePort :: PortNumber
     }
-  deriving (Show)
+  deriving stock (Show, Generic)
 
 -- | Offer secure connection (over TLS)
 data SecureConfig = SecureConfig {
@@ -107,7 +108,7 @@ data SecureConfig = SecureConfig {
       -- | SSL key log
     , secureSslKeyLog :: SslKeyLog
     }
-  deriving (Show)
+  deriving stock (Show, Generic)
 
 {-------------------------------------------------------------------------------
   Simple interface

grapesy/src/Network/GRPC/Util/TLS.hs

@@ -26,6 +26,7 @@ import Control.Exception
 import Data.Default
 import Data.X509 qualified as X509
 import Data.X509.CertificateStore qualified as X509
+import GHC.Generics (Generic)
 import System.Environment
 import System.X509 qualified as X509
 
@@ -134,7 +135,7 @@ data SslKeyLog =
     --
     -- This is the default.
   | SslKeyLogFromEnv
-  deriving (Show, Eq)
+  deriving stock (Show, Eq, Generic)
 
 instance Default SslKeyLog where
   def = SslKeyLogFromEnv

grapesy/test-grapesy/Main.hs

@@ -20,6 +20,7 @@ import Test.Sanity.Disconnect                 qualified as Disconnect
 import Test.Sanity.EndOfStream                qualified as EndOfStream
 import Test.Sanity.Exception                  qualified as Exception
 import Test.Sanity.Interop                    qualified as Interop
+import Test.Sanity.Reclamation                qualified as Reclamation
 import Test.Sanity.StreamingType.CustomFormat qualified as StreamingType.CustomFormat
 import Test.Sanity.StreamingType.NonStreaming qualified as StreamingType.NonStreaming
 
@@ -38,6 +39,7 @@ main = do
           , Compression.tests
           , Exception.tests
           , Interop.tests
+          , Reclamation.tests
           , BrokenDeployments.tests
           ]
       , testGroup "Prop" [

grapesy/test-grapesy/Test/Driver/Dialogue/Execution.hs

@@ -264,9 +264,12 @@ clientLocal clock call = \(LocalSteps steps) ->
       -> Bool
     isGrpcException mErr (Left err) = and [
           grpcError        err == GrpcUnknown
-        , grpcErrorMessage err == Just (case mErr of
-                                    Nothing   -> "HandlerTerminated"
-                                    Just err' -> Text.pack $ show err')
+        , grpcErrorMessage err == Just (mconcat [
+              "Server-side exception: "
+            , case mErr of
+                Nothing   -> "HandlerTerminated"
+                Just err' -> Text.pack $ show err'
+            ])
         ]
     isGrpcException _ (Right _) = False
 

grapesy/test-grapesy/Test/Sanity/Interop.hs

@@ -262,7 +262,7 @@ test_cancellation_server =
             Left err -> do
               assertEqual "grpcError" GrpcUnknown $
                 grpcError err
-              assertEqual "grpcErrorMessage" (Just "HandlerTerminated") $
+              assertEqual "grpcErrorMessage" (Just "Server-side exception: HandlerTerminated") $
                 grpcErrorMessage err
             Right _ ->
               assertFailure "Expected exception"