fix tests

markdroth · Dec 26, 2024 · 425434a · 425434a
1 parent 0b1454e
commit 425434a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc
@@ -1373,7 +1373,7 @@ TEST_F(RlsEnd2endTest, ConnectivityStateTransientFailure) {
                                     BuildRlsResponse({"invalid_target"}));
   CheckRpcSendFailure(
       DEBUG_LOCATION, StatusCode::UNAVAILABLE,
-      "empty address list: no address in fixed_address_lb policy",
+      "empty address list (no address in fixed_address_lb policy)",
       RpcOptions().set_metadata({{"key1", kTestValue}}));
   EXPECT_EQ(rls_server_->service_.request_count(), 1);
   EXPECT_EQ(rls_server_->service_.response_count(), 1);

diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
@@ -798,8 +798,8 @@ TEST_P(AggregateClusterTest, ReconfigEdsWhileLogicalDnsChildFails) {
   }
   // When an RPC fails, we know the channel has seen the update.
   constexpr char kErrorMessage[] =
-      "empty address list: DNS resolution failed for server.example.com:443: "
-      "UNAVAILABLE: injected error";
+      "empty address list \\(DNS resolution failed for server.example.com:443: "
+      "UNAVAILABLE: injected error\\)";
   CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::UNAVAILABLE, kErrorMessage);
   // Send an EDS update that moves locality1 to priority 0.
   args1 = EdsResourceArgs({

diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc
@@ -723,8 +723,8 @@ TEST_P(CsdsShortAdsTimeoutTest, XdsConfigDumpListenerDoesNotExist) {
   balancer_->ads_service()->UnsetResource(kLdsTypeUrl, kServerName);
   CheckRpcSendFailure(
       DEBUG_LOCATION, StatusCode::UNAVAILABLE,
-      absl::StrCat("empty address list: LDS resource ", kServerName,
-                   ": does not exist \\(node ID:xds_end2end_test\\)"),
+      absl::StrCat("empty address list \\(LDS resource ", kServerName,
+                   ": does not exist \\(node ID:xds_end2end_test\\)\\)"),
       RpcOptions().set_timeout_ms(kTimeoutMillisecond));
   auto csds_response = FetchCsdsResponse();
   EXPECT_THAT(csds_response.config(0).generic_xds_configs(),
@@ -740,9 +740,9 @@ TEST_P(CsdsShortAdsTimeoutTest, XdsConfigDumpRouteConfigDoesNotExist) {
                                           kDefaultRouteConfigurationName);
   CheckRpcSendFailure(
       DEBUG_LOCATION, StatusCode::UNAVAILABLE,
-      absl::StrCat("empty address list: RDS resource ",
+      absl::StrCat("empty address list \\(RDS resource ",
                    kDefaultRouteConfigurationName,
-                   ": does not exist \\(node ID:xds_end2end_test\\)"),
+                   ": does not exist \\(node ID:xds_end2end_test\\)\\)"),
       RpcOptions().set_timeout_ms(kTimeoutMillisecond));
   auto csds_response = FetchCsdsResponse();
   EXPECT_THAT(

diff --git a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
@@ -147,11 +147,11 @@ TEST_P(XdsFallbackTest, PrimarySecondaryNotAvailable) {
   CheckRpcSendFailure(
       DEBUG_LOCATION, StatusCode::UNAVAILABLE,
       absl::StrFormat(
-          "empty address list: LDS resource server.example.com: "
+          "empty address list \\(LDS resource server.example.com: "
           "xDS channel for server localhost:%d: "
           "xDS call failed with no responses received; "
-          "status: RESOURCE_EXHAUSTED: test forced ADS stream failure \\(node "
-          "ID:xds_end2end_test\\)",
+          "status: RESOURCE_EXHAUSTED: test forced ADS stream failure "
+          "\\(node ID:xds_end2end_test\\)\\)",
           fallback_balancer_->port()));
 }