From bd5dae28dc7ced76ff9871596cb1ba614f1fbd4d Mon Sep 17 00:00:00 2001 From: Ara Ayvazyan Date: Fri, 30 Mar 2018 10:59:59 -0700 Subject: Fix crashing server_builder_test --- test/cpp/server/server_builder_test.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'test/cpp/server/server_builder_test.cc') diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index 2752b5838c..067a184377 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -39,7 +39,10 @@ grpc::string MakePort() { return s.str(); } -grpc::string g_port = MakePort(); +const grpc::string& GetPort() { + static grpc::string g_port = MakePort(); + return g_port; +} TEST(ServerBuilderTest, NoOp) { ServerBuilder b; } @@ -50,7 +53,7 @@ TEST(ServerBuilderTest, CreateServerNoPorts) { TEST(ServerBuilderTest, CreateServerOnePort) { ServerBuilder() .RegisterService(&g_service) - .AddListeningPort(g_port, InsecureServerCredentials()) + .AddListeningPort(GetPort(), InsecureServerCredentials()) .BuildAndStart() ->Shutdown(); } @@ -58,8 +61,8 @@ TEST(ServerBuilderTest, CreateServerOnePort) { TEST(ServerBuilderTest, CreateServerRepeatedPort) { ServerBuilder() .RegisterService(&g_service) - .AddListeningPort(g_port, InsecureServerCredentials()) - .AddListeningPort(g_port, InsecureServerCredentials()) + .AddListeningPort(GetPort(), InsecureServerCredentials()) + .AddListeningPort(GetPort(), InsecureServerCredentials()) .BuildAndStart() ->Shutdown(); } @@ -67,8 +70,8 @@ TEST(ServerBuilderTest, CreateServerRepeatedPort) { TEST(ServerBuilderTest, CreateServerRepeatedPortWithDisallowedReusePort) { EXPECT_EQ(ServerBuilder() .RegisterService(&g_service) - .AddListeningPort(g_port, InsecureServerCredentials()) - .AddListeningPort(g_port, InsecureServerCredentials()) + .AddListeningPort(GetPort(), InsecureServerCredentials()) + .AddListeningPort(GetPort(), InsecureServerCredentials()) .AddChannelArgument(GRPC_ARG_ALLOW_REUSEPORT, 0) .BuildAndStart(), nullptr); -- cgit v1.2.3