diff --git a/source/common/network/apple_dns_impl.cc b/source/common/network/apple_dns_impl.cc index 45d082ad38ea9..25a44ace0a666 100644 --- a/source/common/network/apple_dns_impl.cc +++ b/source/common/network/apple_dns_impl.cc @@ -324,8 +324,6 @@ void AppleDnsResolverImpl::PendingResolution::onDNSServiceGetAddrInfoReply( return; } - ENVOY_BUG(interface_index == 0, fmt::format("unexpected interface_index={}", interface_index)); - // Only add this address to the list if kDNSServiceFlagsAdd is set. Callback targets are only // additive. if (flags & kDNSServiceFlagsAdd) { diff --git a/test/common/network/apple_dns_impl_test.cc b/test/common/network/apple_dns_impl_test.cc index 1dc149dbf1274..66cc2921300bb 100644 --- a/test/common/network/apple_dns_impl_test.cc +++ b/test/common/network/apple_dns_impl_test.cc @@ -139,6 +139,7 @@ TEST_F(AppleDnsImplTest, DestructPending) { TEST_F(AppleDnsImplTest, LocalLookup) { EXPECT_NE(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::Auto, DnsResolver::ResolutionStatus::Success, true)); + dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersion) { @@ -414,37 +415,6 @@ TEST_F(AppleDnsImplFakeApiTest, QuerySynchronousCompletion) { dns_callback_executed.WaitForNotification(); } -TEST_F(AppleDnsImplFakeApiTest, IncorrectInterfaceIndexReturned) { - createResolver(); - - const std::string hostname = "foo.com"; - sockaddr_in addr4; - addr4.sin_family = AF_INET; - EXPECT_EQ(1, inet_pton(AF_INET, "1.2.3.4", &addr4.sin_addr)); - addr4.sin_port = htons(6502); - - Network::Address::Ipv4Instance address(&addr4); - - EXPECT_CALL(*initialize_failure_timer_, enabled()).WillOnce(Return(false)); - EXPECT_CALL(dns_service_, - dnsServiceGetAddrInfo(_, kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout, 0, - kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6, - StrEq(hostname.c_str()), _, _)) - .WillOnce(DoAll( - // Have the API call synchronously call the provided callback. Notice the incorrect - // interface_index "2". This will cause an assertion failure. - WithArgs<5, 6>(Invoke([&](DNSServiceGetAddrInfoReply callback, void* context) -> void { - EXPECT_DEATH(callback(nullptr, kDNSServiceFlagsAdd, 2, kDNSServiceErr_NoError, - hostname.c_str(), address.sockAddr(), 30, context), - "unexpected interface_index=2"); - })), - Return(kDNSServiceErr_NoError))); - - resolver_->resolve( - hostname, Network::DnsLookupFamily::Auto, - [](DnsResolver::ResolutionStatus, std::list&&) -> void { FAIL(); }); -} - TEST_F(AppleDnsImplFakeApiTest, QueryCompletedWithError) { createResolver();