diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-31 07:45:59 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-31 07:45:59 -0700 |
| commit | 44a127c80ff6a9fca8da1aad79afc8a33a723b1d (patch) | |
| tree | ae2be5ce187baa10df0fbc9843ec9330d313c724 /test | |
| parent | a7957f50af10954e2f266e979638ef13ac7c4460 (diff) | |
| parent | 909917955c99f6b32f34b4966c252daca0fe7061 (diff) | |
Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
Conflicts:
vsprojects/Grpc.mak
vsprojects/grpc.sln
vsprojects/grpc/grpc.vcxproj
vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj
vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj
vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj
vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj
vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/security/oauth2_utils.c | 2 | ||||
| -rw-r--r-- | test/cpp/qps/qps_test.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index ecd04fd9e1..2df2f99269 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -84,7 +84,7 @@ char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { gpr_mu_lock(GRPC_POLLSET_MU(&request.pollset)); while (!request.is_done) - grpc_pollset_work(&request.pollset, gpr_inf_future(GPR_CLOCK_REALTIME)); + grpc_pollset_work(&request.pollset, gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); grpc_pollset_shutdown(&request.pollset, do_nothing, NULL); diff --git a/test/cpp/qps/qps_test.cc b/test/cpp/qps/qps_test.cc index 7b93443f7c..ba980a6664 100644 --- a/test/cpp/qps/qps_test.cc +++ b/test/cpp/qps/qps_test.cc @@ -53,8 +53,8 @@ static void RunQPS() { ClientConfig client_config; client_config.set_client_type(ASYNC_CLIENT); client_config.set_enable_ssl(false); - client_config.set_outstanding_rpcs_per_channel(10); - client_config.set_client_channels(800); + client_config.set_outstanding_rpcs_per_channel(1000); + client_config.set_client_channels(8); client_config.set_payload_size(1); client_config.set_async_client_threads(8); client_config.set_rpc_type(UNARY); |