From 2a9f8f4c40c35069020982f7d601be709bb224dc Mon Sep 17 00:00:00 2001
From: gkampitakis <gkabitakis@gmail.com>
Date: Tue, 9 Jul 2024 19:30:23 +0100
Subject: [PATCH] address comments for testing

---
 packages/grpc-js/gulpfile.ts           |  2 +-
 packages/grpc-js/test/test-resolver.ts | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/grpc-js/gulpfile.ts b/packages/grpc-js/gulpfile.ts
index 5d5fdd27..9b7041b3 100644
--- a/packages/grpc-js/gulpfile.ts
+++ b/packages/grpc-js/gulpfile.ts
@@ -83,7 +83,7 @@ const runTests = checkTask(() => {
 
 const testWithAlternativeResolver = checkTask(() => {
   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({
       reporter: 'mocha-jenkins-reporter',
       require: ['ts-node/register'],
diff --git a/packages/grpc-js/test/test-resolver.ts b/packages/grpc-js/test/test-resolver.ts
index 62754249..4bae0c30 100644
--- a/packages/grpc-js/test/test-resolver.ts
+++ b/packages/grpc-js/test/test-resolver.ts
@@ -31,6 +31,7 @@ import {
   subchannelAddressEqual,
 } from '../src/subchannel-address';
 import { parseUri, GrpcUri } from '../src/uri-parser';
+import { GRPC_NODE_USE_ALTERNATIVE_RESOLVER } from '../src/environment';
 
 function hasMatchingAddress(
   endpointList: Endpoint[],
@@ -55,7 +56,10 @@ describe('Name Resolver', () => {
   describe('DNS Names', function () {
     // For some reason DNS queries sometimes take a long time on Windows
     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(
         parseUri('localhost:50051')!
       )!;
@@ -82,7 +86,10 @@ describe('Name Resolver', () => {
       const resolver = resolverManager.createResolver(target, listener, {});
       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(
         parseUri('localhost')!
       )!;
@@ -402,7 +409,10 @@ describe('Name Resolver', () => {
       const resolver2 = resolverManager.createResolver(target2, listener, {});
       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(
         parseUri('localhost')!
       )!;
@@ -460,7 +470,7 @@ describe('Name Resolver', () => {
             }
           },
         },
-        { 'grpc.dns_min_time_between_resolutions_ms': 2000 }
+        {}
       );
       resolver.updateResolution();
       setTimeout(() => {