diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-09-11 13:33:57 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-09-11 18:37:59 -0700 |
| commit | a4c43a6cbb6554fe180e0d64dfa27f6b868b65d5 (patch) | |
| tree | f18b8159289ec0652a219a016eefaaa86b600270 /test/cpp/interop/client.cc | |
| parent | 3924fcb1c0d0c2ae9fd2995da4ce79e903766fef (diff) | |
| parent | 35fea62432d7a41b5b3bc96d9af7975310553fe7 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into rr_with_registry
Diffstat (limited to 'test/cpp/interop/client.cc')
| -rw-r--r-- | test/cpp/interop/client.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 20fe1c515f..ba44a918db 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -120,11 +120,10 @@ int main(int argc, char** argv) { grpc::string json_key = GetServiceAccountJsonKey(); client.DoJwtTokenCreds(json_key); } else if (FLAGS_test_case == "oauth2_auth_token") { - grpc::string json_key = GetServiceAccountJsonKey(); - client.DoOauth2AuthToken(json_key, FLAGS_oauth_scope); + client.DoOauth2AuthToken(FLAGS_default_service_account, FLAGS_oauth_scope); } else if (FLAGS_test_case == "per_rpc_creds") { grpc::string json_key = GetServiceAccountJsonKey(); - client.DoPerRpcCreds(json_key, FLAGS_oauth_scope); + client.DoPerRpcCreds(json_key); } else if (FLAGS_test_case == "status_code_and_message") { client.DoStatusWithMessage(); } else if (FLAGS_test_case == "all") { @@ -143,8 +142,9 @@ int main(int argc, char** argv) { if (FLAGS_enable_ssl) { grpc::string json_key = GetServiceAccountJsonKey(); client.DoJwtTokenCreds(json_key); - client.DoOauth2AuthToken(json_key, FLAGS_oauth_scope); - client.DoPerRpcCreds(json_key, FLAGS_oauth_scope); + client.DoOauth2AuthToken( + FLAGS_default_service_account, FLAGS_oauth_scope); + client.DoPerRpcCreds(json_key); } // compute_engine_creds only runs in GCE. } else { |