From 1695b2312b6d5f12f83159706c0c3efd1e4fccbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 29 Oct 2024 15:45:15 +0100 Subject: [PATCH 1/2] adapt callback to promise that block tests --- packages/mongo/tests/observe_changes_tests.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mongo/tests/observe_changes_tests.js b/packages/mongo/tests/observe_changes_tests.js index 0fe94d2ebf..8974bd7b22 100644 --- a/packages/mongo/tests/observe_changes_tests.js +++ b/packages/mongo/tests/observe_changes_tests.js @@ -495,6 +495,7 @@ if (Meteor.isServer) { self.handle = await cursor.observeChanges({ added: function(id, fields) { self.xs.push(fields.x); + console.log('self.expects.length', self.expects); test.notEqual(self.expects.length, 0); self.expects.pop()(); }, From ac103bad1fedfc0f7c38c65770ccb3cc2a5fc6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 29 Oct 2024 15:45:32 +0100 Subject: [PATCH 2/2] adapt callback to promise that block tests --- packages/mongo/oplog_tailing.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts index fe99db2833..440339fa6f 100644 --- a/packages/mongo/oplog_tailing.ts +++ b/packages/mongo/oplog_tailing.ts @@ -226,14 +226,9 @@ export class OplogHandle { ); try { - const isMasterDoc = await new Promise((resolve, reject) => { - this._oplogLastEntryConnection!.db - .admin() - .command({ ismaster: 1 }, (err: Error | null, result: any) => { - if (err) reject(err); - else resolve(result); - }); - }); + const isMasterDoc = await this._oplogLastEntryConnection!.db + .admin() + .command({ ismaster: 1 }); if (!(isMasterDoc && isMasterDoc.setName)) { throw new Error("$MONGO_OPLOG_URL must be set to the 'local' database of a Mongo replica set"); @@ -426,4 +421,4 @@ export function idForOp(op: OplogEntry): string { } else { throw Error("Unknown op: " + JSON.stringify(op)); } -} \ No newline at end of file +}