From 2cbd26776d1da1fd1daa4a30658e08fa27968178 Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Tue, 23 Sep 2025 14:45:39 +0200 Subject: [PATCH 1/4] test(NODE-7182): migrate `integration/connection-monitoring-and-pooling` tests --- .../connection.test.ts | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/test/integration/connection-monitoring-and-pooling/connection.test.ts b/test/integration/connection-monitoring-and-pooling/connection.test.ts index eb6a8b39821..862e426e4f3 100644 --- a/test/integration/connection-monitoring-and-pooling/connection.test.ts +++ b/test/integration/connection-monitoring-and-pooling/connection.test.ts @@ -1,7 +1,8 @@ +import { type EventEmitter, once } from 'node:events'; +import { setTimeout } from 'node:timers'; + import { expect } from 'chai'; -import { type EventEmitter, once } from 'events'; import * as sinon from 'sinon'; -import { setTimeout } from 'timers'; import { addContainerMetadata, @@ -173,7 +174,7 @@ describe('Connection', function () { metadata: { requires: { topology: 'single', os: '!win32' } }, - test: function (done) { + test: async function () { const configuration = this.configuration; const uri = `mongodb://${encodeURIComponent('/tmp/mongodb-27017.sock')}?w=1`; const options: MongoClientOptions = { @@ -186,22 +187,10 @@ describe('Connection', function () { const db = client.db(configuration.db); - db.collection('domainSocketCollection0').insert( - { a: 1 }, - { writeConcern: { w: 1 } }, - function (err) { - expect(err).to.not.exist; - - db.collection('domainSocketCollection0') - .find({ a: 1 }) - .toArray(function (err, items) { - expect(err).to.not.exist; - test.equal(1, items.length); + await db.collection('domainSocketCollection0').insert({ a: 1 }, { writeConcern: { w: 1 } }); - done(); - }); - } - ); + const items = await db.collection('domainSocketCollection0').find({ a: 1 }).toArray(); + test.equal(1, items.length); } }); From b49430e2c53b5c9164147156d4a3ac6af973720a Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Tue, 23 Sep 2025 14:57:34 +0200 Subject: [PATCH 2/4] test(NODE-7182): fix typescript types & imports --- .../connection.test.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/integration/connection-monitoring-and-pooling/connection.test.ts b/test/integration/connection-monitoring-and-pooling/connection.test.ts index 862e426e4f3..ee9d2169e68 100644 --- a/test/integration/connection-monitoring-and-pooling/connection.test.ts +++ b/test/integration/connection-monitoring-and-pooling/connection.test.ts @@ -5,23 +5,24 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import { - addContainerMetadata, Binary, - connect, - Connection, type ConnectionOptions, - HostAddress, - LEGACY_HELLO_COMMAND, - makeClientMetadata, MongoClient, MongoClientAuthProviders, type MongoClientOptions, - MongoDBResponse, MongoServerError, - ns, - ServerHeartbeatStartedEvent, - Topology -} from '../../mongodb'; + ServerHeartbeatStartedEvent +} from '../../../src'; +import { connect } from '../../../src/cmap/connect'; +import { Connection } from '../../../src/cmap/connection'; +import { + addContainerMetadata, + makeClientMetadata +} from '../../../src/cmap/handshake/client_metadata'; +import { MongoDBResponse } from '../../../src/cmap/wire_protocol/responses'; +import { LEGACY_HELLO_COMMAND } from '../../../src/constants'; +import { Topology } from '../../../src/sdam/topology'; +import { HostAddress, ns } from '../../../src/utils'; import * as mock from '../../tools/mongodb-mock/index'; import { processTick, sleep } from '../../tools/utils'; import { assert as test, setupDatabase } from '../shared'; From 5ebbbac920b94261f3f9a5777b22ca2d6183591f Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Tue, 23 Sep 2025 18:34:15 +0200 Subject: [PATCH 3/4] test(NODE-7182): replace .insert with .insertOne Co-authored-by: Bailey Pearson --- .../connection-monitoring-and-pooling/connection.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/connection-monitoring-and-pooling/connection.test.ts b/test/integration/connection-monitoring-and-pooling/connection.test.ts index ee9d2169e68..fd7b2dec244 100644 --- a/test/integration/connection-monitoring-and-pooling/connection.test.ts +++ b/test/integration/connection-monitoring-and-pooling/connection.test.ts @@ -188,7 +188,7 @@ describe('Connection', function () { const db = client.db(configuration.db); - await db.collection('domainSocketCollection0').insert({ a: 1 }, { writeConcern: { w: 1 } }); + await db.collection('domainSocketCollection0').insertOne({ a: 1 }, { writeConcern: { w: 1 } }); const items = await db.collection('domainSocketCollection0').find({ a: 1 }).toArray(); test.equal(1, items.length); From 791aa29fe9d034e0bc89e987a5d5a6370c802c37 Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Wed, 24 Sep 2025 10:32:56 +0200 Subject: [PATCH 4/4] test(NODE-7182): lint --- .../connection-monitoring-and-pooling/connection.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/connection-monitoring-and-pooling/connection.test.ts b/test/integration/connection-monitoring-and-pooling/connection.test.ts index fd7b2dec244..64e7f5c952c 100644 --- a/test/integration/connection-monitoring-and-pooling/connection.test.ts +++ b/test/integration/connection-monitoring-and-pooling/connection.test.ts @@ -188,7 +188,9 @@ describe('Connection', function () { const db = client.db(configuration.db); - await db.collection('domainSocketCollection0').insertOne({ a: 1 }, { writeConcern: { w: 1 } }); + await db + .collection('domainSocketCollection0') + .insertOne({ a: 1 }, { writeConcern: { w: 1 } }); const items = await db.collection('domainSocketCollection0').find({ a: 1 }).toArray(); test.equal(1, items.length);