diff options
| author |  yang-g <yangg@google.com> | 2015-10-06 14:45:01 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-10-06 14:45:01 -0700 |
| commit | 92981d5c3db1c140118a0d192e6c7f75203b9055 (patch) | |
| tree | e3aae2b67ca761f02ce54de51f7aee95a9d36e74 /test/cpp/interop/client_helper.cc | |
| parent | fbfd3d42d2f4fcbc627b713f5ba7f0540bc0a8d0 (diff) | |
remove flag use_prod_roots in interop test and add use_test_ca per the interop test spec
Diffstat (limited to 'test/cpp/interop/client_helper.cc')
| -rw-r--r-- | test/cpp/interop/client_helper.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc index cbad21e318..61b46d25aa 100644 --- a/test/cpp/interop/client_helper.cc +++ b/test/cpp/interop/client_helper.cc @@ -52,7 +52,7 @@ #include "test/cpp/util/create_test_channel.h" DECLARE_bool(use_tls); -DECLARE_bool(use_prod_roots); +DECLARE_bool(use_test_ca); DECLARE_int32(server_port); DECLARE_string(server_host); DECLARE_string(server_host_override); @@ -102,7 +102,7 @@ std::shared_ptr<Channel> CreateChannelForTestCase( GPR_ASSERT(FLAGS_use_tls); creds = GoogleComputeEngineCredentials(); return CreateTestChannel(host_port, FLAGS_server_host_override, - FLAGS_use_tls, FLAGS_use_prod_roots, creds); + FLAGS_use_tls, !FLAGS_use_test_ca, creds); } else if (test_case == "jwt_token_creds") { std::shared_ptr<Credentials> creds; GPR_ASSERT(FLAGS_use_tls); @@ -111,15 +111,15 @@ std::shared_ptr<Channel> CreateChannelForTestCase( creds = ServiceAccountJWTAccessCredentials(json_key, token_lifetime.count()); return CreateTestChannel(host_port, FLAGS_server_host_override, - FLAGS_use_tls, FLAGS_use_prod_roots, creds); + FLAGS_use_tls, !FLAGS_use_test_ca, creds); } else if (test_case == "oauth2_auth_token") { grpc::string raw_token = GetOauth2AccessToken(); std::shared_ptr<Credentials> creds = AccessTokenCredentials(raw_token); return CreateTestChannel(host_port, FLAGS_server_host_override, - FLAGS_use_tls, FLAGS_use_prod_roots, creds); + FLAGS_use_tls, !FLAGS_use_test_ca, creds); } else { return CreateTestChannel(host_port, FLAGS_server_host_override, - FLAGS_use_tls, FLAGS_use_prod_roots); + FLAGS_use_tls, !FLAGS_use_test_ca); } } |