update sinon stubs

Author: tadjik1

src/connection_string.ts

@@ -41,17 +41,17 @@ const LB_REPLICA_SET_ERROR = 'loadBalanced option not supported with a replicaSe
 const LB_DIRECT_CONNECTION_ERROR =
   'loadBalanced option not supported when directConnection is provided';
 
-function retryDNSTimeoutFor(api: 'SRV'): (a: string) => Promise<dns.SrvRecord[]>;
-function retryDNSTimeoutFor(api: 'TXT'): (a: string) => Promise<string[][]>;
+function retryDNSTimeoutFor(rrtype: 'SRV'): (a: string) => Promise<dns.SrvRecord[]>;
+function retryDNSTimeoutFor(rrtype: 'TXT'): (a: string) => Promise<string[][]>;
 function retryDNSTimeoutFor(
-  api: 'SRV' | 'TXT'
+  rrtype: 'SRV' | 'TXT'
 ): (a: string) => Promise<dns.SrvRecord[] | string[][]> {
   return async function dnsReqRetryTimeout(lookupAddress: string) {
     try {
-      return (await dns.promises.resolve(lookupAddress, api)) as dns.SrvRecord[] | string[][];
+      return (await dns.promises.resolve(lookupAddress, rrtype)) as dns.SrvRecord[] | string[][];
     } catch (firstDNSError) {
       if (firstDNSError.code === dns.TIMEOUT) {
-        return (await dns.promises.resolve(lookupAddress, api)) as dns.SrvRecord[] | string[][];
+        return (await dns.promises.resolve(lookupAddress, rrtype)) as dns.SrvRecord[] | string[][];
       } else {
         throw firstDNSError;
       }

test/integration/initial-dns-seedlist-discovery/dns_seedlist.test.ts

@@ -31,25 +31,23 @@ describe('DNS timeout errors', () => {
     await client.close();
   });
 
-  const restoreDNS = api => async args => {
-    sinon.restore();
-    return await dns.promises.resolve(args, api);
+  const restoreDNS = rrtype => async hostname => {
+    stub.restore();
+    return await dns.promises.resolve(hostname, rrtype);
   };
 
   describe('when SRV record look up times out', () => {
     beforeEach(() => {
-      stub = sinon
-        .stub(dns.promises, 'resolve')
+      stub = sinon.stub(dns.promises, 'resolve').callThrough();
+
+      stub
+        .withArgs(sinon.match.string, 'SRV')
         .onFirstCall()
         .rejects(new DNSTimeoutError())
         .onSecondCall()
         .callsFake(restoreDNS('SRV'));
     });
 
-    afterEach(async function () {
-      sinon.restore();
-    });
-
     it('retries timeout error', metadata, async () => {
       await client.connect();
       expect(stub).to.have.been.calledTwice;
@@ -58,18 +56,16 @@ describe('DNS timeout errors', () => {
 
   describe('when TXT record look up times out', () => {
     beforeEach(() => {
-      stub = sinon
-        .stub(dns.promises, 'resolve')
+      stub = sinon.stub(dns.promises, 'resolve').callThrough();
+
+      stub
+        .withArgs(sinon.match.string, 'TXT')
         .onFirstCall()
         .rejects(new DNSTimeoutError())
         .onSecondCall()
         .callsFake(restoreDNS('TXT'));
     });
 
-    afterEach(async function () {
-      sinon.restore();
-    });
-
     it('retries timeout error', metadata, async () => {
       await client.connect();
       expect(stub).to.have.been.calledTwice;
@@ -78,18 +74,16 @@ describe('DNS timeout errors', () => {
 
   describe('when SRV record look up times out twice', () => {
     beforeEach(() => {
-      stub = sinon
-        .stub(dns.promises, 'resolve')
+      stub = sinon.stub(dns.promises, 'resolve').callThrough();
+
+      stub
+        .withArgs(sinon.match.string, 'SRV')
         .onFirstCall()
         .rejects(new DNSTimeoutError())
         .onSecondCall()
         .rejects(new DNSTimeoutError());
     });
 
-    afterEach(async function () {
-      sinon.restore();
-    });
-
     it('throws timeout error', metadata, async () => {
       const error = await client.connect().catch(error => error);
       expect(error).to.be.instanceOf(DNSTimeoutError);
@@ -99,18 +93,16 @@ describe('DNS timeout errors', () => {
 
   describe('when TXT record look up times out twice', () => {
     beforeEach(() => {
-      stub = sinon
-        .stub(dns.promises, 'resolve')
+      stub = sinon.stub(dns.promises, 'resolve').callThrough();
+
+      stub
+        .withArgs(sinon.match.string, 'TXT')
         .onFirstCall()
         .rejects(new DNSTimeoutError())
         .onSecondCall()
         .rejects(new DNSTimeoutError());
     });
 
-    afterEach(async function () {
-      sinon.restore();
-    });
-
     it('throws timeout error', metadata, async () => {
       const error = await client.connect().catch(error => error);
       expect(error).to.be.instanceOf(DNSTimeoutError);
@@ -120,18 +112,16 @@ describe('DNS timeout errors', () => {
 
   describe('when SRV record look up throws a non-timeout error', () => {
     beforeEach(() => {
-      stub = sinon
-        .stub(dns.promises, 'resolve')
+      stub = sinon.stub(dns.promises, 'resolve').callThrough();
+
+      stub
+        .withArgs(sinon.match.string, 'SRV')
         .onFirstCall()
         .rejects(new DNSSomethingError())
         .onSecondCall()
         .callsFake(restoreDNS('SRV'));
     });
 
-    afterEach(async function () {
-      sinon.restore();
-    });
-
     it('throws that error', metadata, async () => {
       const error = await client.connect().catch(error => error);
       expect(error).to.be.instanceOf(DNSSomethingError);
@@ -141,18 +131,16 @@ describe('DNS timeout errors', () => {
 
   describe('when TXT record look up throws a non-timeout error', () => {
     beforeEach(() => {
-      stub = sinon
-        .stub(dns.promises, 'resolve')
+      stub = sinon.stub(dns.promises, 'resolve').callThrough();
+
+      stub
+        .withArgs(sinon.match.string, 'TXT')
         .onFirstCall()
         .rejects(new DNSSomethingError())
         .onSecondCall()
         .callsFake(restoreDNS('TXT'));
     });
 
-    afterEach(async function () {
-      sinon.restore();
-    });
-
     it('throws that error', metadata, async () => {
       const error = await client.connect().catch(error => error);
       expect(error).to.be.instanceOf(DNSSomethingError);