diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-08 13:32:32 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-08 13:32:32 -0700 |
| commit | 7a0ae4c7f7bbeb8baef19c6d7c3e5c5b0dbe96a2 (patch) | |
| tree | 3639f056b650d298fb1bbb660bad8cb7e1d69609 /test | |
| parent | 7fd0fd5023a74aa02a43f4a956b59e4965e651ce (diff) | |
| parent | 6d22a583610c02de4f5c5139570ea5fcfb010a25 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpp/interop/client.cc | 2 | ||||
| -rw-r--r-- | test/cpp/interop/client_helper.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index dbe29395b4..cb9b396beb 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -46,7 +46,7 @@ #include "test/cpp/util/test_config.h" DEFINE_bool(use_tls, false, "Whether to use tls."); -DEFINE_bool(use_prod_roots, false, "True to use SSL roots for google"); +DEFINE_bool(use_test_ca, false, "False to use SSL roots for google"); DEFINE_int32(server_port, 0, "Server port."); DEFINE_string(server_host, "127.0.0.1", "Server host to connect to"); DEFINE_string(server_host_override, "foo.test.google.fr", 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); } } |