@@ -24,7 +24,7 @@ import * as resolver_uds from '../src/resolver-uds';
24
24
import * as resolver_ip from '../src/resolver-ip' ;
25
25
import { ServiceConfig } from '../src/service-config' ;
26
26
import { StatusObject } from '../src/call-stream' ;
27
- import { SubchannelAddress , isTcpSubchannelAddress } from "../src/subchannel-address" ;
27
+ import { SubchannelAddress , isTcpSubchannelAddress , subchannelAddressToString } from "../src/subchannel-address" ;
28
28
import { parseUri , GrpcUri } from '../src/uri-parser' ;
29
29
30
30
describe ( 'Name Resolver' , ( ) => {
@@ -223,7 +223,7 @@ describe('Name Resolver', () => {
223
223
isTcpSubchannelAddress ( addr ) &&
224
224
addr . host === '127.0.0.1' &&
225
225
addr . port === 443
226
- )
226
+ ) , `None of [ ${ addressList . map ( addr => subchannelAddressToString ( addr ) ) } ] matched '127.0.0.1:443'`
227
227
) ;
228
228
done ( ) ;
229
229
} ,
@@ -263,7 +263,10 @@ describe('Name Resolver', () => {
263
263
const resolver = resolverManager . createResolver ( target , listener , { } ) ;
264
264
resolver . updateResolution ( ) ;
265
265
} ) ;
266
- it ( 'Should resolve a DNS name to IPv4 and IPv6 addresses' , done => {
266
+ /* This DNS name resolves to only the IPv4 address on Windows, and only the
267
+ * IPv6 address on Mac. There is no result that we can consistently test
268
+ * for here. */
269
+ it . skip ( 'Should resolve a DNS name to IPv4 and IPv6 addresses' , done => {
267
270
const target = resolverManager . mapUriDefaultScheme ( parseUri ( 'loopback46.unittest.grpc.io' ) ! ) ! ;
268
271
const listener : resolverManager . ResolverListener = {
269
272
onSuccessfulResolution : (
@@ -279,7 +282,7 @@ describe('Name Resolver', () => {
279
282
isTcpSubchannelAddress ( addr ) &&
280
283
addr . host === '127.0.0.1' &&
281
284
addr . port === 443
282
- )
285
+ ) , `None of [ ${ addressList . map ( addr => subchannelAddressToString ( addr ) ) } ] matched '127.0.0.1:443'`
283
286
) ;
284
287
/* TODO(murgatroid99): check for IPv6 result, once we can get that
285
288
* consistently */
0 commit comments