From dee3cf6e3438d3482ff7d7e203ca002001087821 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Thu, 13 Jun 2024 17:44:03 -0700 Subject: [PATCH] [e2e tests] fix connection failure regex (#36922) Closes #36922 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36922 from markdroth:e2e_test_flake_fix 1bcc04aaa73cb883ceb9107a65c0323707254884 PiperOrigin-RevId: 643176629 --- test/cpp/end2end/client_lb_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test_lib.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index ea6156b545d..136087b8dd0 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -588,7 +588,7 @@ class ClientLbEnd2endTest : public ::testing::Test { "(Failed to connect to remote host: )?" "(Timeout occurred: )?" // Syscall - "((connect|recvmsg|getsockopt\\(SO\\_ERROR\\)): )?" + "((connect|recvmsg|getsockopt\\(SO\\_ERROR\\)): ?)?" // strerror() output or other message "(Connection refused" "|Connection reset by peer" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index e46a16bdf19..2acf69ff1a0 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -844,7 +844,7 @@ std::string XdsEnd2endTest::MakeConnectionFailureRegex( "(Failed to connect to remote host: )?" "(Timeout occurred: )?" // Syscall - "((connect|recvmsg|getsockopt\\(SO\\_ERROR\\)): )?" + "((connect|recvmsg|getsockopt\\(SO\\_ERROR\\)): ?)?" // strerror() output or other message "(Connection refused" "|Connection reset by peer"