Skip to content

Commit

Permalink
build: fix broken master. (#5137)
Browse files Browse the repository at this point in the history
Merge of stale #4682 caused this.

Signed-off-by: Harvey Tuch <htuch@google.com>
  • Loading branch information
htuch authored Nov 27, 2018
1 parent d265c7c commit 6d9de10
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/server/listener_manager_impl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithApplicationP
{"h2", "http/1.1"}, true, "8.8.8.8", false, true);
ASSERT_NE(filter_chain, nullptr);
EXPECT_TRUE(filter_chain->transportSocketFactory().implementsSecureTransport());
auto transport_socket = filter_chain->transportSocketFactory().createTransportSocket();
auto transport_socket = filter_chain->transportSocketFactory().createTransportSocket(nullptr);
auto ssl_socket = dynamic_cast<Ssl::SslSocket*>(transport_socket.get());
auto server_names = ssl_socket->dnsSansLocalCertificate();
EXPECT_EQ(server_names.size(), 1);
Expand Down Expand Up @@ -1404,7 +1404,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceTypeMa
{"h2", "http/1.1"}, true, "127.0.0.1", true, true);
ASSERT_NE(filter_chain, nullptr);
EXPECT_TRUE(filter_chain->transportSocketFactory().implementsSecureTransport());
auto transport_socket = filter_chain->transportSocketFactory().createTransportSocket();
auto transport_socket = filter_chain->transportSocketFactory().createTransportSocket(nullptr);
auto ssl_socket = dynamic_cast<Ssl::SslSocket*>(transport_socket.get());
auto server_names = ssl_socket->dnsSansLocalCertificate();
EXPECT_EQ(server_names.size(), 1);
Expand All @@ -1415,7 +1415,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceTypeMa
{"h2", "http/1.1"}, true, "/tmp/test.sock", true, true);
ASSERT_NE(filter_chain, nullptr);
EXPECT_TRUE(filter_chain->transportSocketFactory().implementsSecureTransport());
transport_socket = filter_chain->transportSocketFactory().createTransportSocket();
transport_socket = filter_chain->transportSocketFactory().createTransportSocket(nullptr);
ssl_socket = dynamic_cast<Ssl::SslSocket*>(transport_socket.get());
server_names = ssl_socket->dnsSansLocalCertificate();
EXPECT_EQ(server_names.size(), 1);
Expand Down Expand Up @@ -1482,7 +1482,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainWithSourceType
{"h2", "http/1.1"}, true, "4.4.4.4", true, true);
ASSERT_NE(filter_chain, nullptr);
EXPECT_TRUE(filter_chain->transportSocketFactory().implementsSecureTransport());
transport_socket = filter_chain->transportSocketFactory().createTransportSocket();
transport_socket = filter_chain->transportSocketFactory().createTransportSocket(nullptr);
ssl_socket = dynamic_cast<Ssl::SslSocket*>(transport_socket.get());
auto uri = ssl_socket->uriSanLocalCertificate();
EXPECT_EQ(uri, "spiffe://lyft.com/test-team");
Expand All @@ -1492,7 +1492,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainWithSourceType
"4.4.4.4", true, true);
ASSERT_NE(filter_chain, nullptr);
EXPECT_TRUE(filter_chain->transportSocketFactory().implementsSecureTransport());
transport_socket = filter_chain->transportSocketFactory().createTransportSocket();
transport_socket = filter_chain->transportSocketFactory().createTransportSocket(nullptr);
ssl_socket = dynamic_cast<Ssl::SslSocket*>(transport_socket.get());
server_names = ssl_socket->dnsSansLocalCertificate();
EXPECT_EQ(server_names.size(), 2);
Expand Down

0 comments on commit 6d9de10

Please sign in to comment.