grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address comments for testing

This commit is contained in:
gkampitakis 2024-07-09 19:30:23 +01:00
parent f0afe6946f
commit 2a9f8f4c40
No known key found for this signature in database
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/gulpfile.ts
View File

@ -83,7 +83,7 @@ const runTests = checkTask(() => {
const testWithAlternativeResolver = checkTask(() => { const testWithAlternativeResolver = checkTask(() => {
process.env.GRPC_NODE_USE_ALTERNATIVE_RESOLVER = 'true'; process.env.GRPC_NODE_USE_ALTERNATIVE_RESOLVER = 'true';
return gulp.src(`${outDir}/test/**/test-resolver.js`).pipe( return gulp.src(`${outDir}/test/test-resolver.js`).pipe(
mocha({ mocha({
reporter: 'mocha-jenkins-reporter', reporter: 'mocha-jenkins-reporter',
require: ['ts-node/register'], require: ['ts-node/register'],

18
packages/grpc-js/test/test-resolver.ts
View File

@ -31,6 +31,7 @@ import {
subchannelAddressEqual, subchannelAddressEqual,
} from '../src/subchannel-address'; } from '../src/subchannel-address';
import { parseUri, GrpcUri } from '../src/uri-parser'; import { parseUri, GrpcUri } from '../src/uri-parser';
import { GRPC_NODE_USE_ALTERNATIVE_RESOLVER } from '../src/environment';
function hasMatchingAddress( function hasMatchingAddress(
endpointList: Endpoint[], endpointList: Endpoint[],
@ -55,7 +56,10 @@ describe('Name Resolver', () => {
describe('DNS Names', function () { describe('DNS Names', function () {
// For some reason DNS queries sometimes take a long time on Windows // For some reason DNS queries sometimes take a long time on Windows
this.timeout(4000); this.timeout(4000);
it('Should resolve localhost properly', done => { it('Should resolve localhost properly', function (done) {
if (GRPC_NODE_USE_ALTERNATIVE_RESOLVER) {
this.skip();
}
const target = resolverManager.mapUriDefaultScheme( const target = resolverManager.mapUriDefaultScheme(
parseUri('localhost:50051')! parseUri('localhost:50051')!
)!; )!;
@ -82,7 +86,10 @@ describe('Name Resolver', () => {
const resolver = resolverManager.createResolver(target, listener, {}); const resolver = resolverManager.createResolver(target, listener, {});
resolver.updateResolution(); resolver.updateResolution();
}); });
it('Should default to port 443', done => { it('Should default to port 443', function (done) {
if (GRPC_NODE_USE_ALTERNATIVE_RESOLVER) {
this.skip();
}
const target = resolverManager.mapUriDefaultScheme( const target = resolverManager.mapUriDefaultScheme(
parseUri('localhost')! parseUri('localhost')!
)!; )!;
@ -402,7 +409,10 @@ describe('Name Resolver', () => {
const resolver2 = resolverManager.createResolver(target2, listener, {}); const resolver2 = resolverManager.createResolver(target2, listener, {});
resolver2.updateResolution(); resolver2.updateResolution();
}); });
it('should not keep repeating successful resolutions', done => { it('should not keep repeating successful resolutions', function (done) {
if (GRPC_NODE_USE_ALTERNATIVE_RESOLVER) {
this.skip();
}
const target = resolverManager.mapUriDefaultScheme( const target = resolverManager.mapUriDefaultScheme(
parseUri('localhost')! parseUri('localhost')!
)!; )!;
@ -460,7 +470,7 @@ describe('Name Resolver', () => {
} }
}, },
}, },
{ 'grpc.dns_min_time_between_resolutions_ms': 2000 } {}
); );
resolver.updateResolution(); resolver.updateResolution();
setTimeout(() => { setTimeout(() => {