Skip to content

Commit 2422829

Browse files
durrandurran
committed
Revert "test: fix remaining 36 hello responses"
This reverts commit 36eaa30.
1 parent 36eaa30 commit 2422829

10 files changed

+24
-24
lines changed

‎test/functional/buffering_proxy.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe.skip('Buffering Proxy', function () {
3535
var electionIds = [new ObjectId(0), new ObjectId(1)];
3636

3737
// Default message fields
38-
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER_36, {
38+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
3939
setName: 'rs',
4040
setVersion: 1,
4141
electionId: electionIds[0],
@@ -252,7 +252,7 @@ describe.skip('Buffering Proxy', function () {
252252
var electionIds = [new ObjectId(0), new ObjectId(1)];
253253

254254
// Default message fields
255-
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER_36, {
255+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
256256
setName: 'rs',
257257
setVersion: 1,
258258
electionId: electionIds[0],

‎test/functional/collations.test.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Collation', function () {
2121
test: function () {
2222
const configuration = this.configuration;
2323
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
24-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
24+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
2525

2626
let commandResult;
2727
testContext.server.setMessageHandler(request => {
@@ -57,7 +57,7 @@ describe('Collation', function () {
5757
test: function () {
5858
const configuration = this.configuration;
5959
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
60-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
60+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
6161

6262
let commandResult;
6363
testContext.server.setMessageHandler(request => {
@@ -95,7 +95,7 @@ describe('Collation', function () {
9595
test: function () {
9696
const configuration = this.configuration;
9797
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
98-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
98+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
9999

100100
let commandResult;
101101
testContext.server.setMessageHandler(request => {
@@ -131,7 +131,7 @@ describe('Collation', function () {
131131
test: function () {
132132
const configuration = this.configuration;
133133
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
134-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
134+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
135135

136136
let commandResult;
137137
testContext.server.setMessageHandler(request => {
@@ -172,7 +172,7 @@ describe('Collation', function () {
172172
test: function () {
173173
const configuration = this.configuration;
174174
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
175-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
175+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
176176

177177
let commandResult;
178178
testContext.server.setMessageHandler(request => {
@@ -208,7 +208,7 @@ describe('Collation', function () {
208208
test: function () {
209209
const configuration = this.configuration;
210210
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
211-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
211+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
212212

213213
let commandResult;
214214
testContext.server.setMessageHandler(request => {
@@ -246,7 +246,7 @@ describe('Collation', function () {
246246
test: function () {
247247
const configuration = this.configuration;
248248
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
249-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
249+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
250250

251251
let commandResult;
252252
testContext.server.setMessageHandler(request => {
@@ -282,7 +282,7 @@ describe('Collation', function () {
282282
test: function () {
283283
const configuration = this.configuration;
284284
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
285-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
285+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
286286

287287
let commandResult;
288288
testContext.server.setMessageHandler(request => {
@@ -320,7 +320,7 @@ describe('Collation', function () {
320320
test: function () {
321321
const configuration = this.configuration;
322322
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
323-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
323+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
324324

325325
let commandResult;
326326
testContext.server.setMessageHandler(request => {
@@ -356,7 +356,7 @@ describe('Collation', function () {
356356
test: function () {
357357
const configuration = this.configuration;
358358
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
359-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
359+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
360360

361361
let commandResult;
362362
testContext.server.setMessageHandler(request => {
@@ -469,7 +469,7 @@ describe('Collation', function () {
469469
test: function () {
470470
const configuration = this.configuration;
471471
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
472-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
472+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
473473

474474
let commandResult;
475475
testContext.server.setMessageHandler(request => {
@@ -624,7 +624,7 @@ describe('Collation', function () {
624624
test: function () {
625625
const configuration = this.configuration;
626626
const client = configuration.newClient(`mongodb://${testContext.server.uri()}/test`);
627-
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER_36)];
627+
const primary = [Object.assign({}, mock.DEFAULT_ISMASTER)];
628628

629629
let commandResult;
630630
testContext.server.setMessageHandler(request => {

‎test/functional/command_write_concern.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class WriteConcernTest {
1111
this.configuration = configuration;
1212
this.responseDecoration = {};
1313
const electionIds = [new ObjectId(), new ObjectId()];
14-
const defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER_36, {
14+
const defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
1515
setName: 'rs',
1616
setVersion: 1,
1717
electionId: electionIds[0],

‎test/functional/max_staleness.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('Max Staleness', function () {
1111
return mock.createServer().then(server => {
1212
test.server = server;
1313

14-
const defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER_36, { msg: 'isdbgrid' });
14+
const defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' });
1515

1616
// Primary server states
1717
const serverIsMaster = [Object.assign({}, defaultFields)];

‎test/functional/replicaset_mock.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ describe('ReplSet (mocks)', function () {
99
afterEach(() => mock.cleanup());
1010
beforeEach(() => {
1111
// Default message fields
12-
const defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER_36, {
12+
const defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
1313
msg: 'isdbgrid'
1414
});
1515

1616
// Default message fields
17-
const defaultRSFields = Object.assign({}, mock.DEFAULT_ISMASTER_36, {
17+
const defaultRSFields = Object.assign({}, mock.DEFAULT_ISMASTER, {
1818
setName: 'rs',
1919
setVersion: 1,
2020
electionId: new ObjectId(),

‎test/functional/unit-sessions/client.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ describe('Sessions - client/unit', function () {
116116
var doc = request.document;
117117
if (doc.ismaster || doc.hello) {
118118
request.reply(
119-
Object.assign({}, mock.DEFAULT_ISMASTER_36, {
119+
Object.assign({}, mock.DEFAULT_ISMASTER, {
120120
logicalSessionTimeoutMinutes: 10
121121
})
122122
);

‎test/functional/unit_db_list_collections.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ describe('db.listCollections', function () {
7171
});
7272
}
7373

74-
it(config.description, { test: testFn, metadata: { requires: { mongodb: '>=3.6.0' } } });
74+
it(config.description, { test: testFn, metadata: { requires: { mongodb: '>=2.7.6' } } });
7575
});
7676
});

‎test/functional/view.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('Views', function () {
1313
const configuration = this.configuration;
1414

1515
// Default message fields
16-
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER_36);
16+
var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER);
1717

1818
// Primary server states
1919
var primary = [Object.assign({}, defaultFields)];

‎test/unit/_MISC_scram_iterations.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ describe('SCRAM Iterations Tests', function () {
8181
server.setMessageHandler(request => {
8282
const doc = request.document;
8383
if (doc.ismaster || doc.hello) {
84-
return request.reply(Object.assign({}, mock.DEFAULT_ISMASTER_36));
84+
return request.reply(Object.assign({}, mock.DEFAULT_ISMASTER));
8585
} else if (doc.saslStart) {
8686
return request.reply({
8787
ok: 1,
@@ -128,7 +128,7 @@ describe('SCRAM Iterations Tests', function () {
128128
server.setMessageHandler(request => {
129129
const doc = request.document;
130130
if (doc.ismaster || doc.hello) {
131-
return request.reply(Object.assign({}, mock.DEFAULT_ISMASTER_36));
131+
return request.reply(Object.assign({}, mock.DEFAULT_ISMASTER));
132132
} else if (doc.saslStart) {
133133
return request.reply({
134134
ok: 1,

‎test/unit/cursor/find_cursor.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('Find Cursor', function () {
3131
const doc = request.document;
3232
if (doc.ismaster || doc.hello) {
3333
request.reply(
34-
Object.assign({}, mock.DEFAULT_ISMASTER_36, {
34+
Object.assign({}, mock.DEFAULT_ISMASTER, {
3535
maxWireVersion: 6
3636
})
3737
);

0 commit comments

Comments
 (0)