Skip to content

Commit 16b4bd6

Browse files
committed
fix test runner
1 parent d1f3817 commit 16b4bd6

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

test/tools/cmap_spec_runner.ts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ const getTestOpDefinitions = (threadContext: ThreadContext) => ({
205205
clear: function ({ interruptInUseConnections }: { interruptInUseConnections: boolean }) {
206206
return threadContext.pool.clear({ interruptInUseConnections });
207207
},
208-
close: async function () {
209-
return await promisify(ConnectionPool.prototype.close).call(threadContext.pool);
208+
close: function () {
209+
return ConnectionPool.prototype.close.call(threadContext.pool);
210210
},
211211
ready: function () {
212212
return threadContext.pool.ready();
@@ -328,28 +328,20 @@ export class ThreadContext {
328328

329329
closePool() {
330330
this.#server.pool = this.#originalServerPool;
331-
return new Promise(resolve => {
332-
ALL_POOL_EVENTS.forEach(ev => this.pool.removeAllListeners(ev));
333-
this.pool.close(resolve);
334-
});
331+
ALL_POOL_EVENTS.forEach(ev => this.pool.removeAllListeners(ev));
332+
this.pool.close();
335333
}
336334

337335
async tearDown() {
338336
if (this.pool) {
339-
await this.closePool();
337+
this.closePool();
340338
}
341339
const connectionsToDestroy = Array.from(this.orphans).concat(
342340
Array.from(this.connections.values())
343341
);
344-
const promises = connectionsToDestroy.map(conn => {
345-
return new Promise<void>((resolve, reject) =>
346-
conn.destroy({ force: true }, err => {
347-
if (err) return reject(err);
348-
resolve();
349-
})
350-
);
351-
});
352-
await Promise.all(promises);
342+
for (const conn of connectionsToDestroy) {
343+
conn.destroy();
344+
}
353345
this.poolEventsEventEmitter.removeAllListeners();
354346
}
355347
}

0 commit comments

Comments
 (0)