From 22e9ce46e0e0703e7fe25ba9613ef442a76fafcf Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Wed, 8 May 2024 14:01:49 -0700
Subject: [PATCH] [CSM] Minor test modifications (#36564)

Closes #36564

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36564 from yashykt:MetadataExchangeTestFixes 095bdcdd48d29c82edb1809c0107fd43aac81ea5
PiperOrigin-RevId: 631917562
---
 test/cpp/ext/csm/metadata_exchange_test.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc
index 0a37a1cbc1d..aeaad05117d 100644
--- a/test/cpp/ext/csm/metadata_exchange_test.cc
+++ b/test/cpp/ext/csm/metadata_exchange_test.cc
@@ -397,6 +397,9 @@ TEST_P(MetadataExchangeTest, ClientDoesNotSendMetadata) {
   EXPECT_EQ(absl::get<std::string>(attributes.at("csm.mesh_id")), "mesh-id");
   EXPECT_EQ(absl::get<std::string>(attributes.at("csm.remote_workload_type")),
             "unknown");
+  EXPECT_EQ(absl::get<std::string>(
+                attributes.at("csm.remote_workload_canonical_service")),
+            "unknown");
 }
 
 TEST_P(MetadataExchangeTest, VerifyCsmServiceLabels) {
@@ -424,6 +427,8 @@ TEST_P(MetadataExchangeTest, VerifyCsmServiceLabels) {
             "mynamespace");
 }
 
+// Test that metadata exchange works and corresponding service mesh labels are
+// received and recorded even if the server sends a trailers-only response.
 TEST_P(MetadataExchangeTest, Retries) {
   Init(std::move(
       Options()