Merge pull request #185 from well-typed/finley/fix-tests-on-mac

Explicitly use `127.0.0.1` in test suite where appropriate
well-typed · Jul 11, 2024 · eab96f5 · eab96f5
2 parents 978cba0 + 5a05d57
commit eab96f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/test-grapesy/Test/Driver/ClientServer.hs b/test-grapesy/Test/Driver/ClientServer.hs
@@ -156,13 +156,6 @@ data TlsFail =
     -- self signed.
     TlsFailValidation
 
-    -- | Client uses the wrong address (@localhost@ instead of @127.0.0.1@)
-    --
-    -- This too will result in a TLS failure (hostname mismatch). To ensure we
-    -- get the TLS failure we expect, we /do/ add the server's certificate to
-    -- the client's trusted certs.
-  | TlsFailHostname
-
     -- | The server is not configured for TLS
   | TlsFailUnsupported
 
@@ -323,7 +316,6 @@ isExpectedTLSException :: ClientServerConfig -> TLSException -> Bool
 isExpectedTLSException cfg tls =
     case (useTLS cfg, tls) of
       (Just (TlsFail TlsFailValidation)  , HandshakeFailed _) -> True
-      (Just (TlsFail TlsFailHostname)    , HandshakeFailed _) -> True
       (Just (TlsFail TlsFailUnsupported) , HandshakeFailed _) -> True
       _otherwise -> False
 
@@ -449,14 +441,14 @@ withTestServer cfg firstTestFailure handlerLock serverHandlers k = do
             case useTLS cfg of
               Nothing -> Server.ServerConfig {
                   serverInsecure = Just Server.InsecureConfig {
-                      insecureHost = Nothing
+                      insecureHost = Just "127.0.0.1"
                     , insecurePort = serverPort cfg
                     }
                 , serverSecure   = Nothing
                 }
               Just (TlsFail TlsFailUnsupported) -> Server.ServerConfig {
                   serverInsecure = Just Server.InsecureConfig {
-                      insecureHost = Nothing
+                      insecureHost = Just "127.0.0.1"
                     , insecurePort = serverPort cfg
                     }
                 , serverSecure   = Nothing
@@ -558,8 +550,6 @@ runTestClient cfg firstTestFailure port clientRun = do
                         Client.NoServerValidation
                       TlsFail TlsFailValidation ->
                         Client.ValidateServer mempty
-                      TlsFail TlsFailHostname ->
-                        correctClientSetup
                       TlsFail TlsFailUnsupported ->
                         correctClientSetup
                   )
@@ -581,10 +571,8 @@ runTestClient cfg firstTestFailure port clientRun = do
         clientAuthority :: Client.Address
         clientAuthority =
             case useTLS cfg of
-              Just tlsSetup -> Client.Address {
-                  addressHost      = case tlsSetup of
-                                       TlsFail TlsFailHostname -> "localhost"
-                                       _otherwise              -> "127.0.0.1"
+              Just _tlsSetup -> Client.Address {
+                  addressHost      = "127.0.0.1"
                 , addressPort      = port
                 , addressAuthority = Nothing
                 }

diff --git a/test-grapesy/Test/Sanity/StreamingType/NonStreaming.hs b/test-grapesy/Test/Sanity/StreamingType/NonStreaming.hs
@@ -72,10 +72,6 @@ tests = testGroup "Test.Sanity.StreamingType.NonStreaming" [
                     test_increment def {
                         useTLS = Just $ TlsFail TlsFailValidation
                       }
-                , testCase "hostname" $
-                    test_increment def {
-                        useTLS = Just $ TlsFail TlsFailHostname
-                      }
                 , testCase "unsupported" $
                     test_increment def {
                         useTLS = Just $ TlsFail TlsFailUnsupported