Skip to content

Commit fb7d617

Browse files
committed
fix tests
1 parent 7d97dfa commit fb7d617

File tree

5 files changed

+32
-26
lines changed

5 files changed

+32
-26
lines changed

test/unit/assorted/polling_srv_records_for_mongos_discovery.prose.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ describe('Polling Srv Records for Mongos Discovery', () => {
115115

116116
afterEach(function (done) {
117117
if (context.topology) {
118-
context.topology.close({}, done);
118+
context.topology.close();
119+
done();
119120
} else {
120121
done();
121122
}

test/unit/assorted/server_selection_spec_helper.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ function executeServerSelectionTest(testDefinition, testDone) {
110110
});
111111

112112
function done(err) {
113-
topology.close({}, e => testDone(e || err));
113+
topology.close();
114+
testDone(err);
114115
}
115116

116117
topology.connect(err => {

test/unit/error.test.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,10 @@ describe('MongoErrors', () => {
359359

360360
makeAndConnectReplSet((err, topology) => {
361361
// cleanup the server before calling done
362-
const cleanup = err => topology.close({ force: true }, err2 => done(err || err2));
362+
const cleanup = err => {
363+
topology.close();
364+
done();
365+
};
363366

364367
if (err) {
365368
return cleanup(err);
@@ -402,7 +405,10 @@ describe('MongoErrors', () => {
402405

403406
makeAndConnectReplSet((err, topology) => {
404407
// cleanup the server before calling done
405-
const cleanup = err => topology.close({}, err2 => done(err || err2));
408+
const cleanup = err => {
409+
topology.close();
410+
done(err);
411+
};
406412

407413
if (err) {
408414
return cleanup(err);

test/unit/sdam/monitor.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ describe('monitoring', function () {
9393
const serverDescription = Array.from(topology.description.servers.values())[0];
9494
expect(serverDescription).property('roundTripTime').to.be.greaterThan(0);
9595

96-
topology.close({}, done as any);
96+
topology.close();
97+
done();
9798
}, 500);
9899
});
99100
}).skipReason = 'TODO(NODE-3819): Unskip flaky tests';

test/unit/sdam/topology.test.js

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('Topology (unit)', function () {
2626
}
2727

2828
if (topology) {
29-
topology.close({});
29+
topology.close();
3030
}
3131
});
3232

@@ -104,7 +104,8 @@ describe('Topology (unit)', function () {
104104
.then(expect.fail, err => {
105105
expect(err).to.exist;
106106
expect(err).to.match(/timed out/);
107-
topology.close({}, done);
107+
topology.close();
108+
done();
108109
});
109110
});
110111
});
@@ -251,7 +252,8 @@ describe('Topology (unit)', function () {
251252
expect(err).to.exist;
252253
expect(err).to.eql(serverDescription.error);
253254
expect(poolCleared).to.be.false;
254-
topology.close({}, done);
255+
topology.close();
256+
done();
255257
});
256258
});
257259
});
@@ -401,17 +403,12 @@ describe('Topology (unit)', function () {
401403

402404
it('should clean up listeners on close', function (done) {
403405
topology.s.state = 'connected'; // fake state to test clean up logic
404-
topology.close({}, e => {
405-
const srvPollerListeners = topology.s.srvPoller.listeners(
406-
SrvPoller.SRV_RECORD_DISCOVERY
407-
);
408-
expect(srvPollerListeners).to.have.lengthOf(0);
409-
const topologyChangeListeners = topology.listeners(
410-
Topology.TOPOLOGY_DESCRIPTION_CHANGED
411-
);
412-
expect(topologyChangeListeners).to.have.lengthOf(0);
413-
done(e);
414-
});
406+
topology.close();
407+
const srvPollerListeners = topology.s.srvPoller.listeners(SrvPoller.SRV_RECORD_DISCOVERY);
408+
expect(srvPollerListeners).to.have.lengthOf(0);
409+
const topologyChangeListeners = topology.listeners(Topology.TOPOLOGY_DESCRIPTION_CHANGED);
410+
expect(topologyChangeListeners).to.have.lengthOf(0);
411+
done();
415412
});
416413
});
417414

@@ -481,7 +478,8 @@ describe('Topology (unit)', function () {
481478
// occurs `requestCheck` will be called for an immediate check.
482479
expect(requestCheck).property('callCount').to.equal(1);
483480

484-
topology.close({}, done);
481+
topology.close();
482+
done();
485483
});
486484
});
487485
});
@@ -493,12 +491,11 @@ describe('Topology (unit)', function () {
493491
this.emit('connect');
494492
});
495493

496-
topology.close({}, () => {
497-
topology.selectServer(ReadPreference.primary, { serverSelectionTimeoutMS: 2000 }, err => {
498-
expect(err).to.exist;
499-
expect(err).to.match(/Topology is closed/);
500-
done();
501-
});
494+
topology.close();
495+
topology.selectServer(ReadPreference.primary, { serverSelectionTimeoutMS: 2000 }, err => {
496+
expect(err).to.exist;
497+
expect(err).to.match(/Topology is closed/);
498+
done();
502499
});
503500
});
504501

0 commit comments

Comments
 (0)