Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test runner
  • Loading branch information
W-A-James committed Mar 6, 2024
commit 16b4bd6d707d80b583e6456b9d673f545e2c6ac9
24 changes: 8 additions & 16 deletions test/tools/cmap_spec_runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ const getTestOpDefinitions = (threadContext: ThreadContext) => ({
clear: function ({ interruptInUseConnections }: { interruptInUseConnections: boolean }) {
return threadContext.pool.clear({ interruptInUseConnections });
},
close: async function () {
return await promisify(ConnectionPool.prototype.close).call(threadContext.pool);
close: function () {
return ConnectionPool.prototype.close.call(threadContext.pool);
},
ready: function () {
return threadContext.pool.ready();
Expand Down Expand Up @@ -328,28 +328,20 @@ export class ThreadContext {

closePool() {
this.#server.pool = this.#originalServerPool;
return new Promise(resolve => {
ALL_POOL_EVENTS.forEach(ev => this.pool.removeAllListeners(ev));
this.pool.close(resolve);
});
ALL_POOL_EVENTS.forEach(ev => this.pool.removeAllListeners(ev));
this.pool.close();
}

async tearDown() {
if (this.pool) {
await this.closePool();
this.closePool();
}
const connectionsToDestroy = Array.from(this.orphans).concat(
Array.from(this.connections.values())
);
const promises = connectionsToDestroy.map(conn => {
return new Promise<void>((resolve, reject) =>
conn.destroy({ force: true }, err => {
if (err) return reject(err);
resolve();
})
);
});
await Promise.all(promises);
for (const conn of connectionsToDestroy) {
conn.destroy();
}
this.poolEventsEventEmitter.removeAllListeners();
}
}
Expand Down