From 913acf456b3f768880b017c15acbdec7489118bb Mon Sep 17 00:00:00 2001
From: Qixuan Li <qixuanl@google.com>
Date: Wed, 26 Jun 2019 22:32:33 +0000
Subject: [PATCH] fix minor nits

---
 test/cpp/interop/client_helper.cc  |  2 +-
 test/cpp/interop/interop_client.cc | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc
index 2f312542b9b..a7279eb0092 100644
--- a/test/cpp/interop/client_helper.cc
+++ b/test/cpp/interop/client_helper.cc
@@ -107,7 +107,7 @@ std::shared_ptr<Channel> CreateChannelForTestCase(
                 : AccessTokenCredentials(GetOauth2AccessToken());
   } else if (test_case == "pick_first_unary") {
     ChannelArguments channel_args;
-    // force using pick first policy
+    // allow the LB policy to be configured with service config
     channel_args.SetInt(GRPC_ARG_SERVICE_CONFIG_DISABLE_RESOLUTION, 0);
     return CreateTestChannel(host_port, FLAGS_custom_credentials_type,
                              FLAGS_server_host_override, !FLAGS_use_test_ca,
diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc
index 7c9a702a726..f474903331f 100644
--- a/test/cpp/interop/interop_client.cc
+++ b/test/cpp/interop/interop_client.cc
@@ -952,7 +952,7 @@ bool InteropClient::DoPickFirstUnary() {
   const int rpcCount = 100;
   SimpleRequest request;
   SimpleResponse response;
-  std::string first_server_id;
+  std::string server_id;
   request.set_fill_server_id(true);
   for (int i = 0; i < rpcCount; i++) {
     ClientContext context;
@@ -961,11 +961,14 @@ bool InteropClient::DoPickFirstUnary() {
       return false;
     }
     if (i == 0) {
-      first_server_id = response.server_id();
-      gpr_log(GPR_DEBUG, "first_user_id is %s", first_server_id.c_str());
+      server_id = response.server_id();
       continue;
     }
-    GPR_ASSERT(response.server_id() == first_server_id);
+    if (response.server_id() != server_id) {
+      gpr_log(GPR_ERROR, "#%d rpc hits server_id %s, expect server_id %s", i,
+              response.server_id().c_str(), server_id.c_str());
+      return false;
+    }
   }
   gpr_log(GPR_DEBUG, "pick first unary successfully finished");
   return true;