[ #154578064 ] - updated tests for pool

Author: denshikov-vovan

tests/helpers.ts

@@ -1,10 +1,9 @@
 import * as net from 'net';
 import {Client, ConnectionConfig} from 'pg';
 import {buildLogger, Logger} from '../lib/util';
-import {CLOSED_EVENT, ConnectionPool, PoolOptions} from '../lib/Pool';
+import {ConnectionPool, PoolOptions} from '../lib/Pool';
 import {settings} from './settings';
 
-export const PROXY_SERVER_PORT   = 3000;
 export const FAKE_PG_SERVER_PORT = 3001;
 
 export function createNewPool(poolOptions: PoolOptions = {}, connectionOptions: ConnectionConfig = {}, logger?: Logger): ConnectionPool {
@@ -56,41 +55,6 @@ export function removeAllClientAndShutdownPool(pool: ConnectionPool): Promise<vo
     return shutdownPool();
 }
 
-export function pgProxyServer(timeout: number, cb): net.Server {
-    const server = net.createServer(proxySocket => {
-        const pgSocket = new net.Socket();
-
-        pgSocket.connect(settings.connection.port, settings.connection.host);
-
-        proxySocket.on('data', data => {
-            setTimeout(() => {
-                const flushed = pgSocket.write(data);
-
-                !flushed && proxySocket.pause();
-            }, timeout);
-        });
-
-        pgSocket.on('data', data => {
-            const flushed = proxySocket.write(data);
-
-            !flushed && pgSocket.pause();
-        });
-
-        proxySocket.on('drain', () => pgSocket.resume());
-
-        pgSocket.on('drain', () => proxySocket.resume());
-
-        proxySocket.on('close', () => pgSocket.end());
-
-        pgSocket.on('close', () => proxySocket.end());
-
-    });
-
-    server.listen(PROXY_SERVER_PORT, cb);
-
-    return server;
-}
-
 export function fakePgServer(cb: Function): net.Server {
     const server = net.createServer();
 

tests/poolIdleTimeout.spec.ts

@@ -2,19 +2,9 @@ import {expect} from 'chai';
 
 import {CLOSED_EVENT} from '../lib/Pool';
 import {ConnectionError} from '../lib/errors';
-import {createNewPool, pgProxyServer, createClient, wait, PROXY_SERVER_PORT} from './helpers';
-
-let server;
+import {createNewPool, createClient, wait} from './helpers';
 
 describe('Pool idle timeout;', () => {
-    before(done => {
-        server = pgProxyServer(250, done);
-    });
-
-    after(done => {
-        server.close(done);
-    });
-
     it('should timeout and remove the client', done => {
         const pool = createNewPool({idleTimeout: 10});
 
@@ -107,8 +97,8 @@ describe('Pool idle timeout;', () => {
     });
 
     it('should removes client after timeout error', async done => {
-        const idleTimeout = 150;
-        const pool = createNewPool({connectionTimeout: 150, idleTimeout}, {port: PROXY_SERVER_PORT});
+        const idleTimeout = 400;
+        const pool = createNewPool({connectionTimeout: 1, idleTimeout});
         let client, timeoutError;
 
         try {
@@ -142,9 +132,9 @@ describe('Pool idle timeout;', () => {
     });
 
     it('should removes client after multiple timeout errors', async done => {
-        const idleTimeout = 1000;
+        const idleTimeout = 400;
         const iterations = 15;
-        const pool = createNewPool({connectionTimeout: 150, idleTimeout, maxSize: iterations}, {port: PROXY_SERVER_PORT});
+        const pool = createNewPool({connectionTimeout: 1, idleTimeout, maxSize: iterations});
         const errors = [];
 
         try {

tests/poolSizing.spec.ts

@@ -1,18 +1,8 @@
 import {expect} from 'chai';
 
-import {createNewPool, createClient, wait, pgProxyServer, PROXY_SERVER_PORT} from './helpers';
-
-let server;
+import {createNewPool, createClient, wait} from './helpers';
 
 describe('Pool size of 1;', () => {
-    before(done => {
-        server = pgProxyServer(250, done);
-    });
-
-    after(done => {
-        server.close(done);
-    });
-
     it('can create a single client and use it once', async done => {
         const pool = createNewPool({maxSize: 1});
 
@@ -36,7 +26,7 @@ describe('Pool size of 1;', () => {
     });
 
     it('can create a single client and use it multiple times', async done => {
-        const pool = createNewPool({maxSize: 1, connectionTimeout: 300}, {port: PROXY_SERVER_PORT});
+        const pool = createNewPool({maxSize: 1, connectionTimeout: 400});
         let clientA, clientB;
 
         try {