diff options
| author |  vjpai <vpai@google.com> | 2015-07-31 07:34:47 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-07-31 07:34:47 -0700 |
| commit | 51b48176ca40796229ca193371a7354dac097e22 (patch) | |
| tree | 9be3d53b0bd9a90d44cdec0aa67a5b26945d7eab /test/cpp | |
| parent | 582c687b4ca18899e811dfbad3075d5b2a2c46df (diff) | |
| parent | 909917955c99f6b32f34b4966c252daca0fe7061 (diff) | |
Merge branch 'master' into asklipion
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/client/credentials_test.cc | 2 | ||||
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/qps_test.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index bbf7705f0a..6fb24d71e5 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -47,7 +47,7 @@ class CredentialsTest : public ::testing::Test { TEST_F(CredentialsTest, InvalidServiceAccountCreds) { std::shared_ptr<Credentials> bad1 = ServiceAccountCredentials("", "", 1); - EXPECT_EQ(static_cast<Credentials *>(nullptr), bad1.get()); + EXPECT_EQ(static_cast<Credentials*>(nullptr), bad1.get()); } } // namespace testing diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index d7a52bf274..5b351c169e 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -516,7 +516,7 @@ TEST_F(End2endTest, DiffPackageServices) { // rpc and stream should fail on bad credentials. TEST_F(End2endTest, BadCredentials) { std::shared_ptr<Credentials> bad_creds = ServiceAccountCredentials("", "", 1); - EXPECT_EQ(static_cast<Credentials *>(nullptr), bad_creds.get()); + EXPECT_EQ(static_cast<Credentials*>(nullptr), bad_creds.get()); std::shared_ptr<ChannelInterface> channel = CreateChannel(server_address_.str(), bad_creds, ChannelArguments()); std::unique_ptr<grpc::cpp::test::util::TestService::Stub> stub( 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); |