From c4b6ffb1b6aa9fb3c5fbf15a5e7e2862cfc4624c Mon Sep 17 00:00:00 2001 From: Yang Gao Date: Thu, 23 Apr 2015 16:35:24 -0700 Subject: Add a GrpcLibrary class to wrap grpc_init and grpc_shutdown and convert all the tests to init/shutdown free. --- test/cpp/client/credentials_test.cc | 2 -- test/cpp/end2end/async_end2end_test.cc | 5 +---- test/cpp/end2end/end2end_test.cc | 5 +---- test/cpp/end2end/generic_end2end_test.cc | 5 +---- test/cpp/interop/client.cc | 4 ---- test/cpp/interop/server.cc | 2 -- test/cpp/qps/qps_driver.cc | 2 -- test/cpp/qps/smoke_test.cc | 3 --- test/cpp/qps/worker.cc | 4 +--- test/cpp/util/cli_call_test.cc | 5 +---- test/cpp/util/grpc_cli.cc | 4 ---- 11 files changed, 5 insertions(+), 36 deletions(-) (limited to 'test') diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 24251f297b..883f1dca7b 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -56,8 +56,6 @@ TEST_F(CredentialsTest, InvalidServiceAccountCreds) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); int ret = RUN_ALL_TESTS(); - grpc_shutdown(); return ret; } diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index dd294d9516..e3cbfd6f8d 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -595,9 +595,6 @@ TEST_F(AsyncEnd2endTest, MetadataRpc) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); ::testing::InitGoogleTest(&argc, argv); - int result = RUN_ALL_TESTS(); - grpc_shutdown(); - return result; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 2d3b405d1c..f63854ccf3 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -562,9 +562,6 @@ TEST_F(End2endTest, ClientCancelsBidi) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); ::testing::InitGoogleTest(&argc, argv); - int result = RUN_ALL_TESTS(); - grpc_shutdown(); - return result; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 584d4bc7ba..e70a1cb68b 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -280,9 +280,6 @@ TEST_F(GenericEnd2endTest, SimpleBidiStreaming) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); ::testing::InitGoogleTest(&argc, argv); - int result = RUN_ALL_TESTS(); - grpc_shutdown(); - return result; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 42d16f2f85..072968f7cd 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -76,8 +76,6 @@ using grpc::testing::CreateChannelForTestCase; using grpc::testing::GetServiceAccountJsonKey; int main(int argc, char** argv) { - grpc_init(); - grpc::testing::InitTest(&argc, &argv, true); int ret = 0; @@ -129,8 +127,6 @@ int main(int argc, char** argv) { FLAGS_test_case.c_str()); ret = 1; } - client.Reset(nullptr); - grpc_shutdown(); return ret; } diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc index 7888102837..22b8910a24 100644 --- a/test/cpp/interop/server.cc +++ b/test/cpp/interop/server.cc @@ -218,13 +218,11 @@ void RunServer() { static void sigint_handler(int x) { got_sigint = true; } int main(int argc, char** argv) { - grpc_init(); grpc::testing::InitTest(&argc, &argv, true); signal(SIGINT, sigint_handler); GPR_ASSERT(FLAGS_port != 0); RunServer(); - grpc_shutdown(); return 0; } diff --git a/test/cpp/qps/qps_driver.cc b/test/cpp/qps/qps_driver.cc index 0669ccf808..93b1247d73 100644 --- a/test/cpp/qps/qps_driver.cc +++ b/test/cpp/qps/qps_driver.cc @@ -69,7 +69,6 @@ using grpc::testing::RpcType; using grpc::testing::ResourceUsage; int main(int argc, char** argv) { - grpc_init(); grpc::testing::InitTest(&argc, &argv, true); RpcType rpc_type; @@ -104,6 +103,5 @@ int main(int argc, char** argv) { ReportLatency(result); ReportTimes(result); - grpc_shutdown(); return 0; } diff --git a/test/cpp/qps/smoke_test.cc b/test/cpp/qps/smoke_test.cc index 9531913b00..e390730832 100644 --- a/test/cpp/qps/smoke_test.cc +++ b/test/cpp/qps/smoke_test.cc @@ -136,14 +136,11 @@ static void RunQPS() { } // namespace grpc int main(int argc, char** argv) { - grpc_init(); - using namespace grpc::testing; RunSynchronousStreamingPingPong(); RunSynchronousUnaryPingPong(); RunAsyncUnaryPingPong(); RunQPS(); - grpc_shutdown(); return 0; } diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc index 896a85cc59..281c617382 100644 --- a/test/cpp/qps/worker.cc +++ b/test/cpp/qps/worker.cc @@ -64,13 +64,11 @@ static void RunServer() { } // namespace grpc int main(int argc, char** argv) { - grpc_init(); grpc::testing::InitTest(&argc, &argv, true); signal(SIGINT, sigint_handler); grpc::testing::RunServer(); - - grpc_shutdown(); + return 0; } diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index 32ef392cc4..457a5e77de 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -123,9 +123,6 @@ TEST_F(CliCallTest, SimpleRpc) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); ::testing::InitGoogleTest(&argc, argv); - int result = RUN_ALL_TESTS(); - grpc_shutdown(); - return result; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/util/grpc_cli.cc b/test/cpp/util/grpc_cli.cc index ee9f275273..d71a7a0b77 100644 --- a/test/cpp/util/grpc_cli.cc +++ b/test/cpp/util/grpc_cli.cc @@ -79,8 +79,6 @@ DEFINE_string(output_binary_file, "output.bin", "Path to output file to write serialized response."); int main(int argc, char** argv) { - grpc_init(); - grpc::testing::InitTest(&argc, &argv, true); if (argc < 4 || grpc::string(argv[1]) != "call") { @@ -127,7 +125,5 @@ int main(int argc, char** argv) { output_file << response; } - channel.reset(); - grpc_shutdown(); return 0; } -- cgit v1.2.3