Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix xds_end2end_test for ipv6 only platforms

Browse Source
pull/25292/head
Yash Tibrewal 4 years ago
parent e6c5554b0e
commit 88086a57a4
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      test/cpp/end2end/xds_end2end_test.cc

22
test/cpp/end2end/xds_end2end_test.cc
Unescape View File

@ -6192,10 +6192,10 @@ class XdsEnabledServerTest : public XdsEnd2endTest {
TEST_P(XdsEnabledServerTest, Basic) { TEST_P(XdsEnabledServerTest, Basic) {
Listener listener; Listener listener;
listener.set_name( listener.set_name(
absl::StrCat("grpc/server?xds.resource.listening_address=127.0.0.1:", absl::StrCat("grpc/server?xds.resource.listening_address=",
backends_[0]->port())); ipv6_only_ ? "[::1]:" : "127.0.0.1:", backends_[0]->port()));
listener.mutable_address()->mutable_socket_address()->set_address( listener.mutable_address()->mutable_socket_address()->set_address(
"127.0.0.1"); ipv6_only_ ? "::1" : "127.0.0.1");
listener.mutable_address()->mutable_socket_address()->set_port_value( listener.mutable_address()->mutable_socket_address()->set_port_value(
backends_[0]->port()); backends_[0]->port());
listener.add_filter_chains(); listener.add_filter_chains();
@ -6211,8 +6211,8 @@ TEST_P(XdsEnabledServerTest, Basic) {
TEST_P(XdsEnabledServerTest, BadLdsUpdateNoApiListenerNorAddress) { TEST_P(XdsEnabledServerTest, BadLdsUpdateNoApiListenerNorAddress) {
Listener listener; Listener listener;
listener.set_name( listener.set_name(
absl::StrCat("grpc/server?xds.resource.listening_address=127.0.0.1:", absl::StrCat("grpc/server?xds.resource.listening_address=",
backends_[0]->port())); ipv6_only_ ? "[::1]:" : "127.0.0.1:", backends_[0]->port()));
listener.add_filter_chains(); listener.add_filter_chains();
balancers_[0]->ads_service()->SetLdsResource(listener); balancers_[0]->ads_service()->SetLdsResource(listener);
CheckRpcSendFailure(1, RpcOptions().set_wait_for_ready(true)); CheckRpcSendFailure(1, RpcOptions().set_wait_for_ready(true));
@ -6226,11 +6226,11 @@ TEST_P(XdsEnabledServerTest, BadLdsUpdateNoApiListenerNorAddress) {
TEST_P(XdsEnabledServerTest, BadLdsUpdateBothApiListenerAndAddress) { TEST_P(XdsEnabledServerTest, BadLdsUpdateBothApiListenerAndAddress) {
Listener listener; Listener listener;
listener.set_name( listener.set_name(
absl::StrCat("grpc/server?xds.resource.listening_address=127.0.0.1:", absl::StrCat("grpc/server?xds.resource.listening_address=",
backends_[0]->port())); ipv6_only_ ? "[::1]:" : "127.0.0.1:", backends_[0]->port()));
balancers_[0]->ads_service()->SetLdsResource(listener); balancers_[0]->ads_service()->SetLdsResource(listener);
listener.mutable_address()->mutable_socket_address()->set_address( listener.mutable_address()->mutable_socket_address()->set_address(
"127.0.0.1"); ipv6_only_ ? "::1" : "127.0.0.1");
listener.mutable_address()->mutable_socket_address()->set_port_value( listener.mutable_address()->mutable_socket_address()->set_port_value(
backends_[0]->port()); backends_[0]->port());
auto* filter_chain = listener.add_filter_chains(); auto* filter_chain = listener.add_filter_chains();
@ -6485,11 +6485,11 @@ class XdsServerSecurityTest : public XdsEnd2endTest {
TEST_P(XdsServerSecurityTest, TlsConfigurationWithoutRootProviderInstance) { TEST_P(XdsServerSecurityTest, TlsConfigurationWithoutRootProviderInstance) {
Listener listener; Listener listener;
listener.set_name( listener.set_name(
absl::StrCat("grpc/server?xds.resource.listening_address=127.0.0.1:", absl::StrCat("grpc/server?xds.resource.listening_address=",
backends_[0]->port())); ipv6_only_ ? "[::1]:" : "127.0.0.1:", backends_[0]->port()));
balancers_[0]->ads_service()->SetLdsResource(listener); balancers_[0]->ads_service()->SetLdsResource(listener);
auto* socket_address = listener.mutable_address()->mutable_socket_address(); auto* socket_address = listener.mutable_address()->mutable_socket_address();
socket_address->set_address("127.0.0.1"); socket_address->set_address(ipv6_only_ ? "::1" : "127.0.0.1");
socket_address->set_port_value(backends_[0]->port()); socket_address->set_port_value(backends_[0]->port());
auto* filter_chain = listener.add_filter_chains(); auto* filter_chain = listener.add_filter_chains();
auto* transport_socket = filter_chain->mutable_transport_socket(); auto* transport_socket = filter_chain->mutable_transport_socket();

Write Preview
Loading…
Cancel
Save