start testing, not all passing yet

markdroth · Feb 1, 2025 · 0fc13f9 · 0fc13f9
1 parent e9f6e36
commit 0fc13f9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc
@@ -414,7 +414,7 @@ void ClientCall::OnReceivedStatus(ServerMetadataHandle server_trailing_metadata,
             server_trailing_metadata->get_pointer(GrpcDelayTracker());
         delay_tracker != nullptr) {
       message_slice = Slice::FromCopiedString(
-          absl::StrCat(message_slice.empty() ? "Deadline exceeded"
+          absl::StrCat(message_slice.empty() ? "Deadline Exceeded"
                                              : message_slice.as_string_view(),
                        " (", delay_tracker->GetDelayInfo(), ")"));
     }

diff --git a/src/core/lib/surface/filter_stack_call.cc b/src/core/lib/surface/filter_stack_call.cc
@@ -467,7 +467,7 @@ void FilterStackCall::RecvTrailingFilter(grpc_metadata_batch* b,
           (delay_tracker = b->get_pointer(GrpcDelayTracker())) != nullptr) {
         std::string msg = absl::StrCat(
             grpc_message.has_value() ? grpc_message->as_string_view()
-                                     : "Deadline exceeded",
+                                     : "Deadline Exceeded",
             " (", delay_tracker->GetDelayInfo(), ")");
         error = grpc_error_set_str(error, StatusStrProperty::kGrpcMessage, msg);
       } else if (grpc_message.has_value()) {

diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc
@@ -63,6 +63,13 @@ void CancelAfterAccept(CoreEnd2endTest& test,
   EXPECT_THAT(server_status.status(),
               ::testing::AnyOf(cancellation_mode->ExpectedStatus(),
                                GRPC_STATUS_INTERNAL));
+  if (server_status.status() == GRPC_STATUS_DEADLINE_EXCEEDED) {
+    EXPECT_THAT(
+        server_status.message(),
+        ::testing::MatchesRegex(
+            "Deadline Exceeded \\(Name resolver delay [0-9]+ms; "
+            "retry attempt 0:\\[Load balancing delay [0-9]+ms\\]\\)"));
+  }
   EXPECT_TRUE(client_close.was_cancelled());
 }