Skip to content
Snippets Groups Projects
Commit 421738b5 authored by Julien Boeuf's avatar Julien Boeuf
Browse files

Addressing comments, round 2.

parent fe4bacb6
No related branches found
No related tags found
No related merge requests found
...@@ -68,7 +68,6 @@ DEFINE_string(test_case, "large_unary", ...@@ -68,7 +68,6 @@ DEFINE_string(test_case, "large_unary",
"cancel_after_begin : cancel stream after starting it; " "cancel_after_begin : cancel stream after starting it; "
"cancel_after_first_response: cancel on first response; " "cancel_after_first_response: cancel on first response; "
"timeout_on_sleeping_server: deadline exceeds on stream; " "timeout_on_sleeping_server: deadline exceeds on stream; "
"service_account_creds : large_unary with service_account auth; "
"compute_engine_creds: large_unary with compute engine auth; " "compute_engine_creds: large_unary with compute engine auth; "
"jwt_token_creds: large_unary with JWT token auth; " "jwt_token_creds: large_unary with JWT token auth; "
"oauth2_auth_token: raw oauth2 access token auth; " "oauth2_auth_token: raw oauth2 access token auth; "
...@@ -114,9 +113,6 @@ int main(int argc, char** argv) { ...@@ -114,9 +113,6 @@ int main(int argc, char** argv) {
client.DoCancelAfterFirstResponse(); client.DoCancelAfterFirstResponse();
} else if (FLAGS_test_case == "timeout_on_sleeping_server") { } else if (FLAGS_test_case == "timeout_on_sleeping_server") {
client.DoTimeoutOnSleepingServer(); client.DoTimeoutOnSleepingServer();
} else if (FLAGS_test_case == "service_account_creds") {
grpc::string json_key = GetServiceAccountJsonKey();
client.DoServiceAccountCreds(json_key, FLAGS_oauth_scope);
} else if (FLAGS_test_case == "compute_engine_creds") { } else if (FLAGS_test_case == "compute_engine_creds") {
client.DoComputeEngineCreds(FLAGS_default_service_account, client.DoComputeEngineCreds(FLAGS_default_service_account,
FLAGS_oauth_scope); FLAGS_oauth_scope);
...@@ -146,7 +142,6 @@ int main(int argc, char** argv) { ...@@ -146,7 +142,6 @@ int main(int argc, char** argv) {
// service_account_creds and jwt_token_creds can only run with ssl. // service_account_creds and jwt_token_creds can only run with ssl.
if (FLAGS_enable_ssl) { if (FLAGS_enable_ssl) {
grpc::string json_key = GetServiceAccountJsonKey(); grpc::string json_key = GetServiceAccountJsonKey();
client.DoServiceAccountCreds(json_key, FLAGS_oauth_scope);
client.DoJwtTokenCreds(json_key); client.DoJwtTokenCreds(json_key);
client.DoOauth2AuthToken(json_key, FLAGS_oauth_scope); client.DoOauth2AuthToken(json_key, FLAGS_oauth_scope);
client.DoPerRpcCreds(json_key, FLAGS_oauth_scope); client.DoPerRpcCreds(json_key, FLAGS_oauth_scope);
...@@ -159,8 +154,7 @@ int main(int argc, char** argv) { ...@@ -159,8 +154,7 @@ int main(int argc, char** argv) {
"large_unary|large_compressed_unary|client_streaming|server_streaming|" "large_unary|large_compressed_unary|client_streaming|server_streaming|"
"server_compressed_streaming|half_duplex|ping_pong|cancel_after_begin|" "server_compressed_streaming|half_duplex|ping_pong|cancel_after_begin|"
"cancel_after_first_response|timeout_on_sleeping_server|" "cancel_after_first_response|timeout_on_sleeping_server|"
"service_account_creds|compute_engine_creds|jwt_token_creds|" "compute_engine_creds|jwt_token_creds|oauth2_auth_token|per_rpc_creds",
"oauth2_auth_token|per_rpc_creds",
FLAGS_test_case.c_str()); FLAGS_test_case.c_str());
ret = 1; ret = 1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment