Skip to content

Commit 4bb6c85

Browse files
committed
Move pool cluster promise test to builtin-runner
1 parent 142cb6a commit 4bb6c85

File tree

2 files changed

+33
-24
lines changed

2 files changed

+33
-24
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { describe, it, before, after } from 'node:test';
2+
import assert from 'node:assert';
3+
import common from '../../../common.js';
4+
import { createPoolCluster } from "../../../../promise.js"
5+
6+
describe('Test pool cluster', { timeout: 1000 }, () => {
7+
8+
it('should propagate warn event to promise wrapper', (t, done) => {
9+
10+
const poolCluster = createPoolCluster();
11+
/* eslint-disable no-invalid-this */
12+
poolCluster
13+
.once('warn', function () {
14+
assert.equal(this, poolCluster);
15+
done();
16+
})
17+
/* eslint-enable no-invalid-this */
18+
poolCluster.poolCluster.emit('warn', new Error());
19+
});
20+
21+
it('should propagate remove event to promise wrapper', (t, done) => {
22+
23+
const poolCluster = createPoolCluster();
24+
/* eslint-disable no-invalid-this */
25+
poolCluster
26+
.once('remove', function () {
27+
assert.equal(this, poolCluster);
28+
done();
29+
});
30+
/* eslint-enable no-invalid-this */
31+
poolCluster.poolCluster.emit('remove');
32+
});
33+
});

test/integration/promise-wrappers/test-promise-wrappers.js

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const assert = require('assert');
1111

1212
const createConnection = require('../../../promise.js').createConnection;
1313
const createPool = require('../../../promise.js').createPool;
14-
const createPoolCluster = require('../../../promise.js').createPoolCluster;
1514

1615
// it's lazy exported from main index.js as well. Test that it's same function
1716
const mainExport = require('../../../index.js').createConnectionPromise;
@@ -20,7 +19,6 @@ assert.equal(mainExport, createConnection);
2019
let doneCalled = false;
2120
let exceptionCaught = false;
2221
let doneEventsConnect = false;
23-
let eventsPoolCluster = false;
2422

2523
let doneCalledPool = false;
2624
let exceptionCaughtPool = false;
@@ -207,26 +205,6 @@ function testEventsConnect() {
207205
});
208206
}
209207

210-
function testEventsConnectPoolCluster() {
211-
const poolCluster = createPoolCluster();
212-
let events = 0;
213-
/* eslint-disable no-invalid-this */
214-
poolCluster
215-
.once('warn', function () {
216-
assert.equal(this, poolCluster);
217-
++events;
218-
})
219-
.once('remove', function () {
220-
assert.equal(this, poolCluster);
221-
++events;
222-
eventsPoolCluster = events === 2;
223-
});
224-
/* eslint-enable no-invalid-this */
225-
poolCluster.poolCluster.emit('warn', new Error());
226-
poolCluster.poolCluster.emit("remove");
227-
228-
}
229-
230208
function testBasicPool() {
231209
const pool = createPool(config);
232210
const promiseConn = pool.getConnection();
@@ -491,7 +469,6 @@ testBasicPool();
491469
testErrorsPool();
492470
testObjParamsPool();
493471
testEventsPool();
494-
testEventsConnectPoolCluster();
495472
testChangeUser();
496473
testConnectionProperties();
497474
testPoolConnectionDestroy();
@@ -501,7 +478,6 @@ process.on('exit', () => {
501478
assert.equal(doneCalled, true, 'done not called');
502479
assert.equal(exceptionCaught, true, 'exception not caught');
503480
assert.equal(doneEventsConnect, true, 'wrong number of connection events');
504-
assert.equal(eventsPoolCluster, true, 'wrong number of pool cluster events');
505481
assert.equal(doneCalledPool, true, 'pool done not called');
506482
assert.equal(exceptionCaughtPool, true, 'pool exception not caught');
507483
assert.equal(doneEventsPool, true, 'wrong number of pool connection events');

0 commit comments

Comments
 (0)