@@ -23,60 +23,60 @@ function read(fname) {
2323}
2424
2525// key1 is signed by ca1.
26- var key1 = read ( 'agent1-key.pem' ) ;
27- var cert1 = read ( 'agent1-cert.pem' ) ;
26+ const key1 = read ( 'agent1-key.pem' ) ;
27+ const cert1 = read ( 'agent1-cert.pem' ) ;
2828
2929// key2 has a self signed cert
30- var key2 = read ( 'agent2-key.pem' ) ;
31- var cert2 = read ( 'agent2-cert.pem' ) ;
30+ const key2 = read ( 'agent2-key.pem' ) ;
31+ const cert2 = read ( 'agent2-cert.pem' ) ;
3232
3333// key3 is signed by ca2.
34- var key3 = read ( 'agent3-key.pem' ) ;
35- var cert3 = read ( 'agent3-cert.pem' ) ;
34+ const key3 = read ( 'agent3-key.pem' ) ;
35+ const cert3 = read ( 'agent3-cert.pem' ) ;
3636
37- var ca1 = read ( 'ca1-cert.pem' ) ;
38- var ca2 = read ( 'ca2-cert.pem' ) ;
37+ const ca1 = read ( 'ca1-cert.pem' ) ;
38+ const ca2 = read ( 'ca2-cert.pem' ) ;
3939
4040// different agents to use different CA lists.
4141// this api is beyond bad.
42- var agent0 = new https . Agent ( ) ;
43- var agent1 = new https . Agent ( { ca : [ ca1 ] } ) ;
44- var agent2 = new https . Agent ( { ca : [ ca2 ] } ) ;
45- var agent3 = new https . Agent ( { ca : [ ca1 , ca2 ] } ) ;
42+ const agent0 = new https . Agent ( ) ;
43+ const agent1 = new https . Agent ( { ca : [ ca1 ] } ) ;
44+ const agent2 = new https . Agent ( { ca : [ ca2 ] } ) ;
45+ const agent3 = new https . Agent ( { ca : [ ca1 , ca2 ] } ) ;
4646
47- var options1 = {
47+ const options1 = {
4848 key : key1 ,
4949 cert : cert1
5050} ;
5151
52- var options2 = {
52+ const options2 = {
5353 key : key2 ,
5454 cert : cert2
5555} ;
5656
57- var options3 = {
57+ const options3 = {
5858 key : key3 ,
5959 cert : cert3
6060} ;
6161
62- var server1 = server ( options1 ) ;
63- var server2 = server ( options2 ) ;
64- var server3 = server ( options3 ) ;
62+ const server1 = server ( options1 ) ;
63+ const server2 = server ( options2 ) ;
64+ const server3 = server ( options3 ) ;
6565
66- var listenWait = 0 ;
66+ let listenWait = 0 ;
6767
6868server1 . listen ( 0 , listening ( ) ) ;
6969server2 . listen ( 0 , listening ( ) ) ;
7070server3 . listen ( 0 , listening ( ) ) ;
7171
72- var responseErrors = { } ;
73- var expectResponseCount = 0 ;
74- var responseCount = 0 ;
75- var pending = 0 ;
72+ const responseErrors = { } ;
73+ let expectResponseCount = 0 ;
74+ let responseCount = 0 ;
75+ let pending = 0 ;
7676
7777
78- function server ( options , port ) {
79- var s = https . createServer ( options , handler ) ;
78+ function server ( options ) {
79+ const s = https . createServer ( options , handler ) ;
8080 s . requests = [ ] ;
8181 s . expectCount = 0 ;
8282 return s ;
@@ -91,7 +91,7 @@ function handler(req, res) {
9191
9292function listening ( ) {
9393 listenWait ++ ;
94- return function ( ) {
94+ return ( ) => {
9595 listenWait -- ;
9696 if ( listenWait === 0 ) {
9797 allListening ( ) ;
@@ -101,7 +101,7 @@ function listening() {
101101
102102function makeReq ( path , port , error , host , ca ) {
103103 pending ++ ;
104- var options = {
104+ const options = {
105105 port : port ,
106106 path : path ,
107107 ca : ca
@@ -125,19 +125,19 @@ function makeReq(path, port, error, host, ca) {
125125 if ( host ) {
126126 options . headers = { host : host } ;
127127 }
128- var req = https . get ( options ) ;
128+ const req = https . get ( options ) ;
129129 expectResponseCount ++ ;
130- var server = port === server1 . address ( ) . port ? server1 :
130+ const server = port === server1 . address ( ) . port ? server1 :
131131 port === server2 . address ( ) . port ? server2 :
132132 port === server3 . address ( ) . port ? server3 :
133133 null ;
134134
135135 if ( ! server ) throw new Error ( 'invalid port: ' + port ) ;
136136 server . expectCount ++ ;
137137
138- req . on ( 'response' , function ( res ) {
138+ req . on ( 'response' , ( res ) => {
139139 responseCount ++ ;
140- assert . equal ( res . connection . authorizationError , error ) ;
140+ assert . strictEqual ( res . connection . authorizationError , error ) ;
141141 responseErrors [ path ] = res . connection . authorizationError ;
142142 pending -- ;
143143 if ( pending === 0 ) {
@@ -195,10 +195,9 @@ function allListening() {
195195
196196}
197197
198- process . on ( 'exit' , function ( ) {
199- console . error ( responseErrors ) ;
200- assert . equal ( server1 . requests . length , server1 . expectCount ) ;
201- assert . equal ( server2 . requests . length , server2 . expectCount ) ;
202- assert . equal ( server3 . requests . length , server3 . expectCount ) ;
203- assert . equal ( responseCount , expectResponseCount ) ;
198+ process . on ( 'exit' , ( ) => {
199+ assert . strictEqual ( server1 . requests . length , server1 . expectCount ) ;
200+ assert . strictEqual ( server2 . requests . length , server2 . expectCount ) ;
201+ assert . strictEqual ( server3 . requests . length , server3 . expectCount ) ;
202+ assert . strictEqual ( responseCount , expectResponseCount ) ;
204203} ) ;
0 commit comments