Skip to content
This repository was archived by the owner on Feb 4, 2022. It is now read-only.

Commit fc5e9d1

Browse files
committed
test(*): ensure all mock servers use common ismaster base
This allows us to inject the `__nodejs_mock_server__` field to all ismasters, which we will use to determine whether or not the remote party can speak OP_MSG.
1 parent 67588f4 commit fc5e9d1

File tree

5 files changed

+18
-63
lines changed

5 files changed

+18
-63
lines changed

test/tests/functional/pool_tests.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,9 @@ describe('Pool tests', function() {
12371237
server
12381238
.addMessageHandler('getnonce', req => req.reply({ ok: 1, result: { nonce: 'testing' } }))
12391239
.addMessageHandler('authenticate', req => req.reply({ ok: 1 }))
1240-
.addMessageHandler('ismaster', req => setTimeout(() => req.reply({ ok: 1 }), 10000));
1240+
.addMessageHandler('ismaster', req =>
1241+
setTimeout(() => req.reply(Object.assign({ ok: 1 }, mock.DEFAULT_ISMASTER)), 10000)
1242+
);
12411243

12421244
var pool = new Pool(
12431245
null,

test/tests/functional/sdam_monitoring_mocks/mongos_topology_tests.js

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,9 @@ describe.skip('Mongos SDAM Monitoring (mocks)', function() {
2222
var currentStep = 0;
2323

2424
// Default message fields
25-
var defaultFields = {
26-
ismaster: true,
27-
msg: 'isdbgrid',
28-
maxBsonObjectSize: 16777216,
29-
maxMessageSizeBytes: 48000000,
30-
maxWriteBatchSize: 1000,
31-
localTime: new Date(),
32-
maxWireVersion: 3,
33-
minWireVersion: 0,
34-
ok: 1
35-
};
25+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
26+
msg: 'isdbgrid'
27+
});
3628

3729
// Primary server states
3830
var serverIsMaster = [Object.assign({}, defaultFields)];
@@ -231,17 +223,9 @@ describe.skip('Mongos SDAM Monitoring (mocks)', function() {
231223
var mongos2 = null;
232224

233225
// Default message fields
234-
var defaultFields = {
235-
ismaster: true,
236-
msg: 'isdbgrid',
237-
maxBsonObjectSize: 16777216,
238-
maxMessageSizeBytes: 48000000,
239-
maxWriteBatchSize: 1000,
240-
localTime: new Date(),
241-
maxWireVersion: 3,
242-
minWireVersion: 0,
243-
ok: 1
244-
};
226+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
227+
msg: 'isdbgrid'
228+
});
245229

246230
// Primary server states
247231
var serverIsMaster = [Object.assign({}, defaultFields)];
@@ -431,17 +415,9 @@ describe.skip('Mongos SDAM Monitoring (mocks)', function() {
431415
var currentStep = 0;
432416

433417
// Default message fields
434-
var defaultFields = {
435-
ismaster: true,
436-
msg: 'isdbgrid',
437-
maxBsonObjectSize: 16777216,
438-
maxMessageSizeBytes: 48000000,
439-
maxWriteBatchSize: 1000,
440-
localTime: new Date(),
441-
maxWireVersion: 3,
442-
minWireVersion: 0,
443-
ok: 1
444-
};
418+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
419+
msg: 'isdbgrid'
420+
});
445421

446422
// Primary server states
447423
var serverIsMaster = [Object.assign({}, defaultFields)];

test/tests/functional/sdam_monitoring_mocks/replset_topology_tests.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,13 @@ describe.skip('ReplSet SDAM Monitoring (mocks)', function() {
2525
var electionIds = [new ObjectId(), new ObjectId()];
2626

2727
// Default message fields
28-
var defaultFields = {
28+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
2929
setName: 'rs',
3030
setVersion: 1,
3131
electionId: electionIds[0],
32-
maxBsonObjectSize: 16777216,
33-
maxMessageSizeBytes: 48000000,
34-
maxWriteBatchSize: 1000,
35-
localTime: new Date(),
36-
maxWireVersion: 4,
37-
minWireVersion: 0,
38-
ok: 1,
3932
hosts: ['localhost:32000', 'localhost:32001'],
4033
arbiters: ['localhost:32002']
41-
};
34+
});
4235

4336
// Primary server states
4437
var primary = [

test/tests/functional/sdam_monitoring_mocks/single_topology_tests.js

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,7 @@ describe.skip('Single SDAM Monitoring (mocks)', function() {
2121
var server = null;
2222

2323
// Default message fields
24-
var defaultFields = {
25-
ismaster: true,
26-
maxBsonObjectSize: 16777216,
27-
maxMessageSizeBytes: 48000000,
28-
maxWriteBatchSize: 1000,
29-
localTime: new Date(),
30-
maxWireVersion: 3,
31-
minWireVersion: 0,
32-
ok: 1
33-
};
24+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER);
3425

3526
// Primary server states
3627
var serverIsMaster = [Object.assign({}, defaultFields)];
@@ -167,17 +158,9 @@ describe.skip('Single SDAM Monitoring (mocks)', function() {
167158
var server = null;
168159

169160
// Default message fields
170-
var defaultFields = {
171-
ismaster: true,
172-
maxBsonObjectSize: 16777216,
173-
maxMessageSizeBytes: 48000000,
174-
maxWriteBatchSize: 1000,
175-
localTime: new Date(),
176-
maxWireVersion: 3,
177-
minWireVersion: 0,
178-
ok: 1,
161+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
179162
hosts: ['a:27017', 'b:27017'] // <-- this makes it an RSPrimary
180-
};
163+
});
181164

182165
// Primary server states
183166
var serverIsMaster = [Object.assign({}, defaultFields)];

test/tests/unit/common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class ReplSetFixture {
2323
this.arbiterServer = servers[2];
2424

2525
this.defaultFields = Object.assign({}, ismaster, {
26+
__nodejs_mock_server__: true,
2627
setName: 'rs',
2728
setVersion: 1,
2829
electionId: this.electionIds[0],

0 commit comments

Comments
 (0)