[e2e tests] fix regex for connection failures to catch a missed case

test/cpp/end2end/client_lb_end2end_test.cc

@@ -580,22 +580,23 @@ class ClientLbEnd2endTest : public ::testing::Test {
   }
 
   static std::string MakeConnectionFailureRegex(absl::string_view prefix) {
-    return absl::StrCat(prefix,
-                        "; last error: (UNKNOWN|UNAVAILABLE): "
-                        // IP address
-                        "(ipv6:%5B::1%5D|ipv4:127.0.0.1):[0-9]+: "
-                        // Prefixes added for context
-                        "(Failed to connect to remote host: )?"
-                        "(Timeout occurred: )?"
-                        // Syscall
-                        "((connect|recvmsg|getsockopt\\(SO\\_ERROR\\)): ?)?"
-                        // strerror() output or other message
-                        "(Connection refused"
-                        "|Connection reset by peer"
-                        "|Socket closed"
-                        "|FD shutdown)"
-                        // errno value
-                        "( \\([0-9]+\\))?");
+    return absl::StrCat(
+        prefix,
+        "; last error: (UNKNOWN|UNAVAILABLE): "
+        // IP address
+        "(ipv6:%5B::1%5D|ipv4:127.0.0.1):[0-9]+: "
+        // Prefixes added for context
+        "(Failed to connect to remote host: )?"
+        "(Timeout occurred: )?"
+        // Syscall
+        "((connect|sendmsg|recvmsg|getsockopt\\(SO\\_ERROR\\)): ?)?"
+        // strerror() output or other message
+        "(Connection refused"
+        "|Connection reset by peer"
+        "|Socket closed"
+        "|FD shutdown)"
+        // errno value
+        "( \\([0-9]+\\))?");
   }
 
   const std::string server_host_;

test/cpp/end2end/xds/xds_end2end_test_lib.cc

@@ -836,22 +836,23 @@ void XdsEnd2endTest::SetProtoDuration(
 
 std::string XdsEnd2endTest::MakeConnectionFailureRegex(
     absl::string_view prefix) {
-  return absl::StrCat(prefix,
-                      "(UNKNOWN|UNAVAILABLE): "
-                      // IP address
-                      "(ipv6:%5B::1%5D|ipv4:127.0.0.1):[0-9]+: "
-                      // Prefixes added for context
-                      "(Failed to connect to remote host: )?"
-                      "(Timeout occurred: )?"
-                      // Syscall
-                      "((connect|recvmsg|getsockopt\\(SO\\_ERROR\\)): ?)?"
-                      // strerror() output or other message
-                      "(Connection refused"
-                      "|Connection reset by peer"
-                      "|Socket closed"
-                      "|FD shutdown)"
-                      // errno value
-                      "( \\([0-9]+\\))?");
+  return absl::StrCat(
+      prefix,
+      "(UNKNOWN|UNAVAILABLE): "
+      // IP address
+      "(ipv6:%5B::1%5D|ipv4:127.0.0.1):[0-9]+: "
+      // Prefixes added for context
+      "(Failed to connect to remote host: )?"
+      "(Timeout occurred: )?"
+      // Syscall
+      "((connect|sendmsg|recvmsg|getsockopt\\(SO\\_ERROR\\)): ?)?"
+      // strerror() output or other message
+      "(Connection refused"
+      "|Connection reset by peer"
+      "|Socket closed"
+      "|FD shutdown)"
+      // errno value
+      "( \\([0-9]+\\))?");
 }
 
 grpc_core::PemKeyCertPairList XdsEnd2endTest::ReadTlsIdentityPair(