merge with upstream

3 files changed, 5 insertions, 5 deletions

diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc
index 5c2b2adb5c..83a7a1744a 100644
--- a/test/cpp/util/cli_call.cc
+++ b/test/cpp/util/cli_call.cc
@@ -95,7 +95,7 @@ Status CliCall::Call(std::shared_ptr<grpc::ChannelInterface> channel,
   cq.Next(&got_tag, &ok);
   GPR_ASSERT(ok);
 
-  if (status.IsOk()) {
+  if (status.ok()) {
     std::vector<grpc::Slice> slices;
     recv_buffer.Dump(&slices);
 
diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc
index fb6e926367..ac7a531f52 100644
--- a/test/cpp/util/cli_call_test.cc
+++ b/test/cpp/util/cli_call_test.cc
@@ -117,7 +117,7 @@ TEST_F(CliCallTest, SimpleRpc) {
   context.AddMetadata("key1", "val1");
   Status s = stub_->Echo(&context, request, &response);
   EXPECT_EQ(response.message(), request.message());
-  EXPECT_TRUE(s.IsOk());
+  EXPECT_TRUE(s.ok());
 
   const grpc::string kMethod("/grpc.cpp.test.util.TestService/Echo");
   grpc::string request_bin, response_bin, expected_response_bin;
diff --git a/test/cpp/util/grpc_cli.cc b/test/cpp/util/grpc_cli.cc
index 06a7029a6d..32d61b0307 100644
--- a/test/cpp/util/grpc_cli.cc
+++ b/test/cpp/util/grpc_cli.cc
@@ -169,7 +169,7 @@ int main(int argc, char** argv) {
                 "Received initial metadata from server:");
   PrintMetadata(server_trailing_metadata,
                 "Received trailing metadata from server:");
-  if (s.IsOk()) {
+  if (s.ok()) {
     std::cout << "Rpc succeeded with OK status" << std::endl;
     if (!response.empty()) {
       std::ofstream output_file(FLAGS_output_binary_file,
@@ -177,8 +177,8 @@ int main(int argc, char** argv) {
       output_file << response;
     }
   } else {
-    std::cout << "Rpc failed with status code " << s.code() << " error message "
-              << s.details() << std::endl;
+    std::cout << "Rpc failed with status code " << s.error_code()
+              << " error message " << s.error_message() << std::endl;
   }
 
   return 0;