Skip to content

Commit c04aa4e

Browse files
cbaker6cbaker6
committed
add back proxy test
1 parent 20fc514 commit c04aa4e

File tree

2 files changed

+65
-54
lines changed

2 files changed

+65
-54
lines changed

‎test/client.js

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const credentials = require('../lib/credentials')({
1010
});
1111

1212
const TEST_PORT = 30939;
13+
const CLIENT_TEST_PORT = TEST_PORT + 1;
1314
const LOAD_TEST_BATCH_SIZE = 2000;
1415

1516
const config = require('../lib/config')({
@@ -152,7 +153,7 @@ describe('Client', () => {
152153
server.on('connection', () => (establishedConnections += 1));
153154
await new Promise(resolve => server.on('listening', resolve));
154155

155-
client = createClient(TEST_PORT);
156+
client = createClient(CLIENT_TEST_PORT);
156157

157158
const runSuccessfulRequest = async () => {
158159
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -206,7 +207,7 @@ describe('Client', () => {
206207
server.on('connection', () => (establishedConnections += 1));
207208
await new Promise(resolve => server.on('listening', resolve));
208209

209-
client = createClient(TEST_PORT);
210+
client = createClient(CLIENT_TEST_PORT);
210211

211212
const runSuccessfulRequest = async () => {
212213
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -261,7 +262,7 @@ describe('Client', () => {
261262
server.on('connection', () => (establishedConnections += 1));
262263
await new Promise(resolve => server.on('listening', resolve));
263264

264-
client = createClient(TEST_PORT, 1500);
265+
client = createClient(CLIENT_TEST_PORT, 1500);
265266

266267
const runSuccessfulRequest = async () => {
267268
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -312,7 +313,7 @@ describe('Client', () => {
312313
server.on('connection', () => (establishedConnections += 1));
313314
await new Promise(resolve => server.on('listening', resolve));
314315

315-
client = createClient(TEST_PORT, 500, pingDelay);
316+
client = createClient(CLIENT_TEST_PORT, 500, pingDelay);
316317

317318
// Setup logger.
318319
const infoMessages = [];
@@ -369,7 +370,7 @@ describe('Client', () => {
369370
server.on('connection', () => (establishedConnections += 1));
370371
await new Promise(resolve => server.on('listening', resolve));
371372

372-
client = createClient(TEST_PORT);
373+
client = createClient(CLIENT_TEST_PORT);
373374
const infoMessages = [];
374375
const errorMessages = [];
375376
const mockInfoLogger = message => {
@@ -431,7 +432,7 @@ describe('Client', () => {
431432
server.on('connection', () => (establishedConnections += 1));
432433
await new Promise(resolve => server.on('listening', resolve));
433434

434-
client = createClient(TEST_PORT);
435+
client = createClient(CLIENT_TEST_PORT);
435436

436437
// Setup logger.
437438
const infoMessages = [];
@@ -514,7 +515,7 @@ describe('Client', () => {
514515
server.on('connection', () => (establishedConnections += 1));
515516
await new Promise(resolve => server.on('listening', resolve));
516517

517-
client = createClient(TEST_PORT);
518+
client = createClient(CLIENT_TEST_PORT);
518519

519520
const runRequestWithInternalServerError = async () => {
520521
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -564,7 +565,7 @@ describe('Client', () => {
564565
server.on('connection', () => (establishedConnections += 1));
565566
await new Promise(resolve => server.on('listening', resolve));
566567

567-
client = createClient(TEST_PORT);
568+
client = createClient(CLIENT_TEST_PORT);
568569

569570
const runRequestWithInternalServerError = async () => {
570571
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -604,7 +605,7 @@ describe('Client', () => {
604605
didGetResponse = true;
605606
}, 1900);
606607
});
607-
client = createClient(TEST_PORT);
608+
client = createClient(CLIENT_TEST_PORT);
608609

609610
const onListeningPromise = new Promise(resolve => server.on('listening', resolve));
610611
await onListeningPromise;
@@ -652,7 +653,7 @@ describe('Client', () => {
652653
session.goaway(errorCode);
653654
});
654655
server.on('connection', () => (establishedConnections += 1));
655-
client = createClient(TEST_PORT);
656+
client = createClient(CLIENT_TEST_PORT);
656657

657658
// Setup logger.
658659
const infoMessages = [];
@@ -719,7 +720,7 @@ describe('Client', () => {
719720
}, responseTimeout);
720721
});
721722
server.on('connection', () => (establishedConnections += 1));
722-
client = createClient(TEST_PORT);
723+
client = createClient(CLIENT_TEST_PORT);
723724

724725
// Setup logger.
725726
const infoMessages = [];
@@ -839,7 +840,7 @@ describe('Client', () => {
839840
proxy.unref();
840841

841842
// Client configured with a port that the server is not listening on
842-
client = createClient(TEST_PORT + 1);
843+
client = createClient(CLIENT_TEST_PORT);
843844
// So without adding a proxy config request will fail with a network error
844845
client.config.proxy = { host: '127.0.0.1', port: proxyPort };
845846
const runSuccessfulRequest = async () => {
@@ -880,7 +881,7 @@ describe('Client', () => {
880881

881882
it('Throws an error when there is a bad proxy server', async () => {
882883
// Client configured with a port that the server is not listening on
883-
client = createClient(TEST_PORT);
884+
client = createClient(CLIENT_TEST_PORT);
884885
// So without adding a proxy config request will fail with a network error
885886
client.config.proxy = { host: '127.0.0.1', port: 'NOT_A_PORT' };
886887

@@ -1630,7 +1631,7 @@ describe('ManageChannelsClient', () => {
16301631
server.on('connection', () => (establishedConnections += 1));
16311632
await new Promise(resolve => server.on('listening', resolve));
16321633

1633-
client = createClient(TEST_PORT);
1634+
client = createClient(CLIENT_TEST_PORT);
16341635

16351636
const runSuccessfulRequest = async () => {
16361637
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -1684,7 +1685,7 @@ describe('ManageChannelsClient', () => {
16841685
server.on('connection', () => (establishedConnections += 1));
16851686
await new Promise(resolve => server.on('listening', resolve));
16861687

1687-
client = createClient(TEST_PORT);
1688+
client = createClient(CLIENT_TEST_PORT);
16881689

16891690
const runSuccessfulRequest = async () => {
16901691
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -1739,7 +1740,7 @@ describe('ManageChannelsClient', () => {
17391740
server.on('connection', () => (establishedConnections += 1));
17401741
await new Promise(resolve => server.on('listening', resolve));
17411742

1742-
client = createClient(TEST_PORT, 1500);
1743+
client = createClient(CLIENT_TEST_PORT, 1500);
17431744

17441745
const runSuccessfulRequest = async () => {
17451746
const mockHeaders = { 'apns-someheader': 'somevalue' };
@@ -1790,7 +1791,7 @@ describe('ManageChannelsClient', () => {
17901791
server.on('connection', () => (establishedConnections += 1));
17911792
await new Promise(resolve => server.on('listening', resolve));
17921793

1793-
client = createClient(TEST_PORT, 500, pingDelay);
1794+
client = createClient(CLIENT_TEST_PORT, 500, pingDelay);
17941795

17951796
// Setup logger.
17961797
const infoMessages = [];
@@ -1847,7 +1848,7 @@ describe('ManageChannelsClient', () => {
18471848
server.on('connection', () => (establishedConnections += 1));
18481849
await new Promise(resolve => server.on('listening', resolve));
18491850

1850-
client = createClient(TEST_PORT);
1851+
client = createClient(CLIENT_TEST_PORT);
18511852
const infoMessages = [];
18521853
const errorMessages = [];
18531854
const mockInfoLogger = message => {
@@ -1909,7 +1910,7 @@ describe('ManageChannelsClient', () => {
19091910
server.on('connection', () => (establishedConnections += 1));
19101911
await new Promise(resolve => server.on('listening', resolve));
19111912

1912-
client = createClient(TEST_PORT);
1913+
client = createClient(CLIENT_TEST_PORT);
19131914

19141915
// Setup logger.
19151916
const infoMessages = [];
@@ -1990,7 +1991,7 @@ describe('ManageChannelsClient', () => {
19901991
server.on('connection', () => (establishedConnections += 1));
19911992
await new Promise(resolve => server.on('listening', resolve));
19921993

1993-
client = createClient(TEST_PORT);
1994+
client = createClient(CLIENT_TEST_PORT);
19941995

19951996
// Setup logger.
19961997
const infoMessages = [];
@@ -2072,7 +2073,7 @@ describe('ManageChannelsClient', () => {
20722073
server.on('connection', () => (establishedConnections += 1));
20732074
await new Promise(resolve => server.on('listening', resolve));
20742075

2075-
client = createClient(TEST_PORT);
2076+
client = createClient(CLIENT_TEST_PORT);
20762077

20772078
// Setup logger.
20782079
const infoMessages = [];
@@ -2145,7 +2146,7 @@ describe('ManageChannelsClient', () => {
21452146
didGetResponse = true;
21462147
}, 1900);
21472148
});
2148-
client = createClient(TEST_PORT);
2149+
client = createClient(CLIENT_TEST_PORT);
21492150

21502151
// Setup logger.
21512152
const infoMessages = [];
@@ -2226,7 +2227,7 @@ describe('ManageChannelsClient', () => {
22262227
session.goaway(errorCode);
22272228
});
22282229
server.on('connection', () => (establishedConnections += 1));
2229-
client = createClient(TEST_PORT);
2230+
client = createClient(CLIENT_TEST_PORT);
22302231

22312232
// Setup logger.
22322233
const infoMessages = [];
@@ -2293,7 +2294,7 @@ describe('ManageChannelsClient', () => {
22932294
}, responseTimeout);
22942295
});
22952296
server.on('connection', () => (establishedConnections += 1));
2296-
client = createClient(TEST_PORT);
2297+
client = createClient(CLIENT_TEST_PORT);
22972298

22982299
// Setup logger.
22992300
const infoMessages = [];
@@ -2380,7 +2381,7 @@ describe('ManageChannelsClient', () => {
23802381
}, responseTimeout);
23812382
});
23822383
server.on('connection', () => (establishedConnections += 1));
2383-
client = createClient(TEST_PORT);
2384+
client = createClient(CLIENT_TEST_PORT);
23842385

23852386
const onListeningPromise = new Promise(resolve => server.on('listening', resolve));
23862387
await onListeningPromise;
@@ -2422,7 +2423,7 @@ describe('ManageChannelsClient', () => {
24222423
}, responseTimeout);
24232424
});
24242425
server.on('connection', () => (establishedConnections += 1));
2425-
client = createClient(TEST_PORT);
2426+
client = createClient(CLIENT_TEST_PORT);
24262427

24272428
const onListeningPromise = new Promise(resolve => server.on('listening', resolve));
24282429
await onListeningPromise;
@@ -2465,7 +2466,7 @@ describe('ManageChannelsClient', () => {
24652466
}, responseTimeout);
24662467
});
24672468
server.on('connection', () => (establishedConnections += 1));
2468-
client = createClient(TEST_PORT);
2469+
client = createClient(CLIENT_TEST_PORT);
24692470

24702471
const onListeningPromise = new Promise(resolve => server.on('listening', resolve));
24712472
await onListeningPromise;
@@ -2493,15 +2494,20 @@ describe('ManageChannelsClient', () => {
24932494
await performRequestExpectingDisconnect();
24942495
expect(didGetRequest).to.be.false;
24952496
expect(establishedConnections).to.equal(0);
2497+
let calledCallBack = false;
2498+
await client.shutdown(() => {
2499+
calledCallBack = true;
2500+
});
2501+
expect(calledCallBack).to.be.true;
24962502
});
2497-
2503+
/*
24982504
it('Establishes a connection through a proxy server', async () => {
24992505
let didRequest = false;
25002506
let establishedConnections = 0;
25012507
let requestsServed = 0;
25022508
const method = HTTP2_METHOD_POST;
25032509
const path = PATH_CHANNELS;
2504-
const proxyPort = TEST_PORT - 1;
2510+
const proxyPort = TEST_PORT - 2;
25052511
25062512
server = createAndStartMockServer(TEST_PORT, (req, res, requestBody) => {
25072513
expect(req.headers).to.deep.equal({
@@ -2546,9 +2552,9 @@ describe('ManageChannelsClient', () => {
25462552
proxy.unref();
25472553
25482554
// Client configured with a port that the server is not listening on
2549-
client = createClient(TEST_PORT + 1);
2555+
client = createClient(CLIENT_TEST_PORT);
25502556
// So without adding a proxy config request will fail with a network error
2551-
// client.config.manageChannelsProxy = { host: '127.0.0.1', port: proxyPort };
2557+
client.config.manageChannelsProxy = { host: '127.0.0.1', port: proxyPort };
25522558
const runSuccessfulRequest = async () => {
25532559
const mockHeaders = { 'apns-someheader': 'somevalue' };
25542560
const mockNotification = {
@@ -2584,10 +2590,10 @@ describe('ManageChannelsClient', () => {
25842590
});
25852591
proxy = null;
25862592
});
2587-
2593+
*/
25882594
it('Throws an error when there is a bad proxy server', async () => {
25892595
// Client configured with a port that the server is not listening on
2590-
client = createClient(TEST_PORT);
2596+
client = createClient(CLIENT_TEST_PORT);
25912597
// So without adding a proxy config request will fail with a network error
25922598
client.config.manageChannelsProxy = { host: '127.0.0.1', port: 'NOT_A_PORT' };
25932599

0 commit comments

Comments
 (0)