diff --git a/package.json b/package.json index 1a3be32b..1aa8974c 100644 --- a/package.json +++ b/package.json @@ -44,13 +44,14 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", + "tap": "^12.0.1", "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" }, "scripts": { "test": "npm run lint && npm run test-ci && npm run test-browser", - "test-ci": "taper tests/test-*.js", + "test-ci": "tap tests/test-*.js", "test-cov": "istanbul cover tape tests/test-*.js", "test-browser": "node tests/browser/start.js", "lint": "standard" @@ -74,8 +75,7 @@ "rimraf": "^2.2.8", "server-destroy": "^1.0.1", "standard": "^9.0.0", - "tape": "^4.6.0", - "taper": "^0.5.0" + "tape": "^4.6.0" }, "greenkeeper": { "ignore": [ diff --git a/tests/ssl/ca/ca.srl b/tests/ssl/ca/ca.srl index fdbe36f8..826cf3c6 100644 --- a/tests/ssl/ca/ca.srl +++ b/tests/ssl/ca/ca.srl @@ -1 +1 @@ -ADF62016AA40C9C5 +ADF62016AA40C9C6 diff --git a/tests/ssl/ca/client-enc.key b/tests/ssl/ca/client-enc.key index a53067b1..446a2912 100644 --- a/tests/ssl/ca/client-enc.key +++ b/tests/ssl/ca/client-enc.key @@ -1,30 +1,30 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: AES-128-CBC,7FD4AC5078EE99FCA866A397D64EAC81 +DEK-Info: AES-128-CBC,E93B0A1A6D0E6163B34940100E8409B0 -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 -----END RSA PRIVATE KEY----- diff --git a/tests/ssl/ca/client.crt b/tests/ssl/ca/client.crt index b3994f69..da96dc98 100644 --- a/tests/ssl/ca/client.crt +++ b/tests/ssl/ca/client.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLjCCApcCCQCt9iAWqkDJxDANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC +MIIDLjCCApcCCQCt9iAWqkDJxTANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1 ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n -ZXJzLmNvbTAeFw0xODA3MDgxMTQ5MjRaFw0yMTA3MDcxMTQ5MjRaMIGPMQswCQYD +ZXJzLmNvbTAeFw0xODA4MTAxNjQ5MDRaFw0yMTA4MDkxNjQ5MDRaMIGPMQswCQYD VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM B3JlcXVlc3QxGjAYBgNVBAsMEXJlcXVlc3RAbG9jYWxob3N0MRMwEQYDVQQDDApU ZXN0Q2xpZW50MR4wHAYJKoZIhvcNAQkBFg9kby5ub3RAZW1haWwubWUwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRD3GmedALZpDCXQ78C2Ehn0R+F7jn -4cbOTOHOBKGbFEb25Is7kHWQfB4AbOgXLs/S6x8DgFHNKr5iIoHiJerSIeGRTJtL -NnJsXfn7c9OZtBwmR3euiQO/evP7HSJZvel4rhb+8pRMf2MAxBC0D6z56iblnULJ -aohqjDPv9D38g7RI7YVurK05fjwnwB21/GRYh+vm5qdw78N+CTMP2rY5IHj4MJcx -qNpJbgMWZ8vDUY1Uf9JNQbrl1lKYeDFzhE3j+1uAPV711srJLvCUqoXPbfS1KKAJ -AJQcheBzd4Ul6wWULBCMLGPw3j6xOoBz6iKwAn+qOQgro2QQpidj/gkFAgMBAAEw -DQYJKoZIhvcNAQELBQADgYEAXopA8nlbYxyKoJeNXKX/+sWtbqYxzfxVo/6iOFMX -3ZSggFFMKCw7pEVgXy4nONNR98C4ga74lo6ljUY+B3xGQxEDYwK1xVgekA2XfQYJ -/ygAdoliF8BEkQ8b9ZoIwmBAIZRQO9b0DzucycvCag7km0O2uWJYQGzFIOQCxJ+v -9r0= +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOv5/cG2Fw3ZpoeGw96bpZDX1MiTtg +MdVpy1dlKpQO1EC4/gObEHKX9aMfk9ulD60M2Cv7ZJ2xG1iW+ojKiaZkWZbAiyiY +RKahVeZ88IPNI/ClhDN2BboTLpGjWYPGQ+sHuH5POn15AurikcZGmBmI6LVbkrUq +/qia5YIPJ7Asr2eJmfEsjlaPt78u476XsEo7+Zqu6HqVJAxVAFrXRBhwSFCU6hqd +8KQTEVd/oSUVsS6FbujOWVPLT4uzGbkoMdwJk1D21ixipUTKBprBE6t6z+wwUURM +Wfx7IU2eMOJDajfOJ5sFn12Tqb9etc4waGEe4hsExrRxDO0wHLSyWsEXAgMBAAEw +DQYJKoZIhvcNAQEFBQADgYEAHJXvJ8TQlho/zPkOyAW/8XZB/fji22uk47DRcAzM +b5NoU6S4lUmXt964DJbkl2rxQ4EZPWrR58RmWKl6KG+sqKzc/I7Ec6C63wVT8b7x +/t9X1n9rYqbIeDH2RzFMumv/oRojh68IIy4ZonX1Ibi1lSVgHaX9sBzjX2EQSKWu +lBk= -----END CERTIFICATE----- diff --git a/tests/ssl/ca/client.csr b/tests/ssl/ca/client.csr index 17b366ac..27510385 100644 --- a/tests/ssl/ca/client.csr +++ b/tests/ssl/ca/client.csr @@ -2,17 +2,17 @@ MIIC+DCCAeACAQAwgY8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UE BwwHT2FrbGFuZDEQMA4GA1UECgwHcmVxdWVzdDEaMBgGA1UECwwRcmVxdWVzdEBs b2NhbGhvc3QxEzARBgNVBAMMClRlc3RDbGllbnQxHjAcBgkqhkiG9w0BCQEWD2Rv -Lm5vdEBlbWFpbC5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEP -caZ50AtmkMJdDvwLYSGfRH4XuOfhxs5M4c4EoZsURvbkizuQdZB8HgBs6Bcuz9Lr -HwOAUc0qvmIigeIl6tIh4ZFMm0s2cmxd+ftz05m0HCZHd66JA7968/sdIlm96Xiu -Fv7ylEx/YwDEELQPrPnqJuWdQslqiGqMM+/0PfyDtEjthW6srTl+PCfAHbX8ZFiH -6+bmp3Dvw34JMw/atjkgePgwlzGo2kluAxZny8NRjVR/0k1BuuXWUph4MXOETeP7 -W4A9XvXWysku8JSqhc9t9LUooAkAlByF4HN3hSXrBZQsEIwsY/DePrE6gHPqIrAC -f6o5CCujZBCmJ2P+CQUCAwEAAaAjMCEGCSqGSIb3DQEJBzEUDBJwYXNzd29yZCBj -aGFsbGVuZ2UwDQYJKoZIhvcNAQELBQADggEBAIVRC0Ct5EETEdbCZRrd2/F7Ujkp -1y7M9diKeXEN+3OuGDuStPe6DM/nO4wz++JBB+NzKAfbr/bMEFnS8wbRFsxGY287 -HyqAYAG8JZZpkcMnr2aXgdcT0YpCuGYh23+r18b34L2050Wmc/C1tJtxj0hAt4qg -Vr1HJQ67V4d2w3BIzq8wTmvBD//ofwydweYXWd7F1zcLgO36HcA8Na4eko6m0dpw -jRbxD1hyrXGkC1CkD43TnZWkIpARXtWzv2G9iaUGyVsVvRrAyts8+ZRu1SGNfdkG -HmBqEzn8mMBc92OYO2OGf/CkueSPivJ0JrbxWKktjytpsBUWwnwBsO/vwDQ= +Lm5vdEBlbWFpbC5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6/ +n9wbYXDdmmh4bD3pulkNfUyJO2Ax1WnLV2UqlA7UQLj+A5sQcpf1ox+T26UPrQzY +K/tknbEbWJb6iMqJpmRZlsCLKJhEpqFV5nzwg80j8KWEM3YFuhMukaNZg8ZD6we4 +fk86fXkC6uKRxkaYGYjotVuStSr+qJrlgg8nsCyvZ4mZ8SyOVo+3vy7jvpewSjv5 +mq7oepUkDFUAWtdEGHBIUJTqGp3wpBMRV3+hJRWxLoVu6M5ZU8tPi7MZuSgx3AmT +UPbWLGKlRMoGmsETq3rP7DBRRExZ/HshTZ4w4kNqN84nmwWfXZOpv161zjBoYR7i +GwTGtHEM7TActLJawRcCAwEAAaAjMCEGCSqGSIb3DQEJBzEUDBJwYXNzd29yZCBj +aGFsbGVuZ2UwDQYJKoZIhvcNAQELBQADggEBAKqjBCyj9WRifIjhZ+pqUQVeiZtL +/v8h363jaYK78zFXXsD0bZP/i8lJoj5Wxsr8vKh/WPnRt+8qH7sWGF8cQLYaQIjm +qsz2XmfaFiEgTK7H3o22NWyiACMQnoM/U2OAo8BUtyjzdjfLxb6lLqdC7oCmJtuO +mN9VGFfjydVY74lYCsKsyhGnHg1FW5wgwo9WH9gfbZN2uJ8wxQj8IlKG+mhIIKJw ++FGHC4N+IJy2GCKia69sBf71h2Nl8qVfqte27D+UZ/1rJuRK5ok/9jLsPgpACAIS +Im2nVld17TFEZcEOXWAHwth6EAdXE11AGO/IvCqKdQoDnTjHWuM94BXbzyw= -----END CERTIFICATE REQUEST----- diff --git a/tests/ssl/ca/client.key b/tests/ssl/ca/client.key index 46542e68..738a6b4d 100644 --- a/tests/ssl/ca/client.key +++ b/tests/ssl/ca/client.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/ssl/ca/localhost.crt b/tests/ssl/ca/localhost.crt index 788557a6..fa67dd98 100644 --- a/tests/ssl/ca/localhost.crt +++ b/tests/ssl/ca/localhost.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCApYCCQCt9iAWqkDJxDANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC +MIIDLTCCApYCCQCt9iAWqkDJxTANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1 ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n -ZXJzLmNvbTAeFw0xODA3MDgxMTQ5MjlaFw0yMTA3MDcxMTQ5MjlaMIGOMQswCQYD +ZXJzLmNvbTAeFw0xODA4MTAxNjQ5MDhaFw0yMTA4MDkxNjQ5MDhaMIGOMQswCQYD VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM B3JlcXVlc3QxGjAYBgNVBAsMEXJlcXVlc3RAbG9jYWxob3N0MRIwEAYDVQQDDAls b2NhbGhvc3QxHjAcBgkqhkiG9w0BCQEWD2RvLm5vdEBlbWFpbC5tZTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoTEIRDVlcBLaEggfE4eosRFjLhc0sg -a3NlLC/67T6hAN2/xbH1yCQpvrq0Xgi5FMXFp0rkFqcLSOEQ4mQH/wFtbj5+IbTj -eZvv2d7G5J+3hY7ALCDoMlwb0ifX8w5qMwPaiGdk7l0Wp/M81IALyVyKrKwlOVqT -ti/2hmhQBHGVLITso/QaGJenCnJ7tkZ6nFYYps0b2sl863jHnmaeY/QYGdCH+Nqn -n6nyuRfLekjboUfRAIqMfxarwVRxBVg4N9YLvT+Qm0U4ZtCCuMXRaKC5YRp5sK/7 -GSngACB3En3ndP71ry6sxwova3Yb4Qeei1S/JonIr+KDTlmko8SXtnkCAwEAATAN -BgkqhkiG9w0BAQsFAAOBgQCpn2KTeSNsI95wVwDaXS4zkb4FtsFdG4368Bt0tKSc -HUlv8OL+h+gJOSfap+0WbY/cBMzGym+mS8MZFXYpDEmknyuSv+Rqs3DEP5nkBZWb -HaaIv1UrUF6XHh/C6kToNXRjZQCKYu2TWiqeA1psdBZBMJPwnvKiG+FKr+fZUAEv -Ug== +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1iQbhVU000Fg7MPT3BeU1nVw5hawIH +FRLh2BYM1yvFSZ5GmhnvwHebi48YDdSsQA5Bdu88HD12m8RIexoVEQ4dGrXGUrIc +x+guITBhqrDB2t7tldBF2EW2kMKv00zpQOPHQ95vlMzxlCvdqdkHTpaKAdHf40vb +8VAN6EAMr/bheJyB2JU4ocb2Z5tEOjzd6/Kv+fUlVZq2sbIo4/mBtGzcSHK1Eori +u9T+qFFdcfrV4X7oQNGS8OCsy1oYiEPhALHv1ZgWWK8HLo+5YGdNYWhVrO5JAuuA +2sygV7YQaC8XIfDtR98jDXN+WiCpoox066FYIG5VQOzdiu3VilRRRR0CAwEAATAN +BgkqhkiG9w0BAQUFAAOBgQAlhenYDc+meCpBE1RRoupMSZXX8holgF8gmw3iV+EY +02UUSwe3+Rw/Rv0/DiHL6U7CItoFuTadQRvhsgTIw7TCDUz7sN9lmXxa//zQWEpx +craO99B1Nf9jmJe2GPmnBAHAlstS55sx/JzeFTrEGu/twTzqadCs5Czf9jbJckg5 +Wg== -----END CERTIFICATE----- diff --git a/tests/ssl/ca/localhost.csr b/tests/ssl/ca/localhost.csr index 22f60936..7f4954fe 100644 --- a/tests/ssl/ca/localhost.csr +++ b/tests/ssl/ca/localhost.csr @@ -2,17 +2,17 @@ MIIC9zCCAd8CAQAwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UE BwwHT2FrbGFuZDEQMA4GA1UECgwHcmVxdWVzdDEaMBgGA1UECwwRcmVxdWVzdEBs b2NhbGhvc3QxEjAQBgNVBAMMCWxvY2FsaG9zdDEeMBwGCSqGSIb3DQEJARYPZG8u -bm90QGVtYWlsLm1lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqhMQ -hENWVwEtoSCB8Th6ixEWMuFzSyBrc2UsL/rtPqEA3b/FsfXIJCm+urReCLkUxcWn -SuQWpwtI4RDiZAf/AW1uPn4htON5m+/Z3sbkn7eFjsAsIOgyXBvSJ9fzDmozA9qI -Z2TuXRan8zzUgAvJXIqsrCU5WpO2L/aGaFAEcZUshOyj9BoYl6cKcnu2RnqcVhim -zRvayXzreMeeZp5j9BgZ0If42qefqfK5F8t6SNuhR9EAiox/FqvBVHEFWDg31gu9 -P5CbRThm0IK4xdFooLlhGnmwr/sZKeAAIHcSfed0/vWvLqzHCi9rdhvhB56LVL8m -iciv4oNOWaSjxJe2eQIDAQABoCMwIQYJKoZIhvcNAQkHMRQMEnBhc3N3b3JkIGNo -YWxsZW5nZTANBgkqhkiG9w0BAQsFAAOCAQEAW/XOubJr04gbdTAkBLjpsYthwOzd -uaX9V8K/tTa8bHKSLGN1AMLAVXu8LTfak8JoWXpGrHlFzvnzZZWMUeUAyaG97fBd -ewnmainh6auACjH8iK1/iRot0D9rvW+32kUyAK9p3mgtRraELiIWMcPZ9eWndZc/ -qRm3S4tPsSSqPLPZNI9BeJ6u7eSGvC0LjdoP5usyNvd+GCO9ZXozBpUfVqV6LULc -D1mMSh08V9/54UcGVDoG5A+BZJx0Eq9ALirJnFXj96lpVc1VRQ4R7tRA+qFaJr7R -017go+qy2ZS7SMoTB2eA6M7eitfurQaBcBntPzAqq6nkRNOekzSYYFtYvg== +bm90QGVtYWlsLm1lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWJB +uFVTTTQWDsw9PcF5TWdXDmFrAgcVEuHYFgzXK8VJnkaaGe/Ad5uLjxgN1KxADkF2 +7zwcPXabxEh7GhURDh0atcZSshzH6C4hMGGqsMHa3u2V0EXYRbaQwq/TTOlA48dD +3m+UzPGUK92p2QdOlooB0d/jS9vxUA3oQAyv9uF4nIHYlTihxvZnm0Q6PN3r8q/5 +9SVVmraxsijj+YG0bNxIcrUSiuK71P6oUV1x+tXhfuhA0ZLw4KzLWhiIQ+EAse/V +mBZYrwcuj7lgZ01haFWs7kkC64DazKBXthBoLxch8O1H3yMNc35aIKmijHTroVgg +blVA7N2K7dWKVFFFHQIDAQABoCMwIQYJKoZIhvcNAQkHMRQMEnBhc3N3b3JkIGNo +YWxsZW5nZTANBgkqhkiG9w0BAQsFAAOCAQEAVBHktANQeQ1olKgfoPGleRgYp6Ys +XfY3jcuokKFGSWZEaSwr5ZiMEAOtPkv63Ohl2l6dJ+PTXPnQbJmvDn9Y9U4SC+7W +DL47uEhcWxrlz/xd8sJCoDlXR3GXoCF4JW0xxZyzKeNlWwBvTQ5hMb4AyZMzzJ/B +JxlIJgAiOagMz0Mb4iaJG35pgHj0Uynns6f7AFSR0UWUtRKAD7Xq6UZtDkYuy3eE +Y9OEID5cPDwsr9QQgNOqbj1F2UI/PzQS57Xlb6SEN1nhLyHyM8tQeStZecui3Vtq +lsE3YsbN1bg+e0gprSJJ/V+TBo4+NvG7iSG+GuT+nJiWXe1E4UIVgRUecw== -----END CERTIFICATE REQUEST----- diff --git a/tests/ssl/ca/localhost.key b/tests/ssl/ca/localhost.key index eccebad3..55236e31 100644 --- a/tests/ssl/ca/localhost.key +++ b/tests/ssl/ca/localhost.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/ssl/ca/server.crt b/tests/ssl/ca/server.crt index ac7b35ff..39c45a8a 100644 --- a/tests/ssl/ca/server.crt +++ b/tests/ssl/ca/server.crt @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEQjCCA6sCCQCt9iAWqkDJxTANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC +MIIEQjCCA6sCCQCt9iAWqkDJxjANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1 ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n -ZXJzLmNvbTAeFw0xODA3MDgxMTQ5MzlaFw0xODA4MDcxMTQ5MzlaMIGjMQswCQYD +ZXJzLmNvbTAeFw0xODA4MTAxNjUxMjdaFw0xODA5MDkxNjUxMjdaMIGjMQswCQYD VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM B3JlcXVlc3QxEDAOBgNVBAsMB3Rlc3RpbmcxKTAnBgNVBAMMIHRlc3RpbmcucmVx dWVzdC5taWtlYWxyb2dlcnMuY29tMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlr -ZWFscm9nZXJzLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKzo -ebuLRx+c/880mgpX3+oxcO9pnCHELvQyVgvlk1Tx5FXunmB3odoxobM37wqzw1Bb -/JyU58+C/kPDVz5ixp5FIBgQCBM7t6VrFvANqe63FCFhwSptdJQHpOJlBZaZ2rRY -cjN8MyoaeLpUpra094N2VCWMaNw2vvY8sCJBj59E+0FScX4obFHmkEX0W1eccS4+ -U6Dd82eLN6bPPhspWlq1XsOny4et5Ik8XHfWJ/alRAml2RdDFzV9aWYIg2LIv2wB -jlnNRX6jve+3+5SkrrnsFZWZO+vSNdqCMUp3pCepwrZo3lal+Yz6Of1jmEtmHGUG -agUwdmg2Fka1HOAKhSXepFaBsM8CJbLBAVUFRmufXBiOxRc2a8+OheHV33TU/V7Z -PdBfpvKX55Qqnm6ekFY2h4LvxNge2WVCVErIvPig+PJLlsm9gHV/KIqZvmJM4j5L -W4towjRfIE4Qw+DoTGcDnCbwRuqcSehFftKYfLPRuAoiAhXPIllE2WD/rwMqRFqW -0jfiHdRYu9AamNJYIJjRAY88iTRrb2/28acMvbz9Lg8jA13kVD3TEETvBX9meEOx -5tnr+nilcoZDdzHsB78mDdX9sQbN9Ic0alFcp92zH7Qw6YBK/6JcFXKECqDn+2J5 -Q9kuI0A2XKMXCn8U8tToL2DRASB7hyi8N3Y9un3nAgMBAAEwDQYJKoZIhvcNAQEL -BQADgYEAF/dmc81+FQWLhrT07oC3UWacbP8LJGigDM18cijn4JgBM/un1AOdaZON -oUP2NQefuB12t6xjAXmY+JuhZqojUjK8OkehKiCUR0x25KYOPyaHLTp7+p9x9aJB -ifN/qMN/ONiAO+ZDvKdFmlEOPzm/oTyzvIY9X3UqxSfjzfLGsN8= +ZWFscm9nZXJzLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL+s +7YLNdjWLzaqTisWQv2bWXf+x/8J1sQaxUFbrVxtqiJdXHkawzVR7YySArQ1RBQfQ +iUGMmMiWPX7txzIC3VqsmrV2edGhNGqTKB5HIiPrF5rQGkOkjhcruG/XDDIGjDIB +IhiCyVst6leX0yUVGILdSV5xyBEghLCocO47v1fBfIE3mZS1Uuodb+JvAWnJaGD2 +4jbks8frfed7SIDFrQR67JEupxqJldBw6f09oFdwD3vO53nFW+4mJecn/VNA8oCq +eo3H21ntjW+zKl6vYl9mFZ3AUgWr0j+IeylS7fx6K7ZmBbep7jRJXf9A9fRDL1O0 +mAMKy84RYYLef4phvQS5PCxuWcLl2BuiHT/dAKHxGGXwCeWsxXMSo5ZpRRSEUaff +zkPXO5YplbLS5/E4CZ1MxoQ1+Bh4uDsh/cf4cVRT1H+amx+1z40rlN/JdX9F8cM1 +fyqaOm2uVmFrYtdzVTG2u4EoKSTBqhyr5lF8dsQdPzH8jd3PBnxTx3Y+Kgv6lzOM +tBVXFLUQhKcFXbhfCMRyfDnMADSEc0NWRuDFrGY1pXCPSNf8DbqnOvNweNR3xrYY +HCln3n7MIED61xgYxQu73s6t5SqLoAs9oZM5q7sqxzU5r5ZvjOzfASzCBq6lv6U3 +BsNTaKTGZOmedsaqcFCrM050HR2mNQuXCvGG6rMvAgMBAAEwDQYJKoZIhvcNAQEL +BQADgYEAeM+YOvaNz0GPr/QV8K0kQniE9d/3Fd1spTbf3d4e4Az95Rse87+sT81E +Rv9GxgOS3kXTtiTF29jjgIn5yGC3ePP8CDXr9+pZnBl5ayuenRP+s8ysfhK5RrqO +ntMY/9eoPbglyb8oQI04jxWif6ewioGEAMSe6J4LyBBeKs4bhOM= -----END CERTIFICATE----- diff --git a/tests/ssl/ca/server.csr b/tests/ssl/ca/server.csr index 76b6a1e7..c58874f9 100644 --- a/tests/ssl/ca/server.csr +++ b/tests/ssl/ca/server.csr @@ -3,27 +3,27 @@ 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 -----END CERTIFICATE REQUEST----- diff --git a/tests/ssl/ca/server.key b/tests/ssl/ca/server.key index d84eaccc..1f49e8cd 100644 --- a/tests/ssl/ca/server.key +++ b/tests/ssl/ca/server.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/test-agent.js b/tests/test-agent.js index 40cdac05..ee3912bf 100644 --- a/tests/test-agent.js +++ b/tests/test-agent.js @@ -4,7 +4,7 @@ var request = require('../index') var version = require('../lib/helpers').version var http = require('http') var ForeverAgent = require('forever-agent') -var tape = require('tape') +var tape = require('tap').test var s = http.createServer(function (req, res) { res.statusCode = 200 diff --git a/tests/test-agentOptions.js b/tests/test-agentOptions.js index 4682cbbb..9ed6fba1 100644 --- a/tests/test-agentOptions.js +++ b/tests/test-agentOptions.js @@ -6,7 +6,7 @@ if (!process.env.running_under_istanbul) { var request = require('../index') var http = require('http') var server = require('./server') - var tape = require('tape') + var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-api.js b/tests/test-api.js index 3aa12fdc..37acb704 100644 --- a/tests/test-api.js +++ b/tests/test-api.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var server tape('setup', function (t) { diff --git a/tests/test-aws.js b/tests/test-aws.js index 44f4f0b0..4e9dea68 100644 --- a/tests/test-aws.js +++ b/tests/test-aws.js @@ -2,7 +2,7 @@ var request = require('../index') var server = require('./server') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-baseUrl.js b/tests/test-baseUrl.js index a9a5e137..87aee9a5 100644 --- a/tests/test-baseUrl.js +++ b/tests/test-baseUrl.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var url = require('url') var s = http.createServer(function (req, res) { diff --git a/tests/test-basic-auth.js b/tests/test-basic-auth.js index 5368b058..2ac43513 100644 --- a/tests/test-basic-auth.js +++ b/tests/test-basic-auth.js @@ -3,7 +3,7 @@ var assert = require('assert') var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var numBasicRequests = 0 var basicServer diff --git a/tests/test-bearer-auth.js b/tests/test-bearer-auth.js index 032ccc7e..98bab345 100644 --- a/tests/test-bearer-auth.js +++ b/tests/test-bearer-auth.js @@ -3,7 +3,7 @@ var assert = require('assert') var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var numBearerRequests = 0 var bearerServer diff --git a/tests/test-body.js b/tests/test-body.js index dc482125..213193d4 100644 --- a/tests/test-body.js +++ b/tests/test-body.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var http = require('http') var s = server.createServer() diff --git a/tests/test-cookies.js b/tests/test-cookies.js index 6bebcaf1..f4aff9ca 100644 --- a/tests/test-cookies.js +++ b/tests/test-cookies.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var validUrl var malformedUrl diff --git a/tests/test-defaults.js b/tests/test-defaults.js index f75f5d7b..530a7fcf 100644 --- a/tests/test-defaults.js +++ b/tests/test-defaults.js @@ -3,7 +3,7 @@ var server = require('./server') var request = require('../index') var qs = require('qs') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-digest-auth.js b/tests/test-digest-auth.js index d5c3c0ee..38585e14 100644 --- a/tests/test-digest-auth.js +++ b/tests/test-digest-auth.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var crypto = require('crypto') function makeHeader () { diff --git a/tests/test-emptyBody.js b/tests/test-emptyBody.js index 684d3d5a..1b73184a 100644 --- a/tests/test-emptyBody.js +++ b/tests/test-emptyBody.js @@ -2,7 +2,7 @@ var request = require('../index') var http = require('http') -var tape = require('tape') +var tape = require('tap').test var s = http.createServer(function (req, resp) { resp.statusCode = 200 diff --git a/tests/test-errors.js b/tests/test-errors.js index 7060e9fc..e6fb78ec 100644 --- a/tests/test-errors.js +++ b/tests/test-errors.js @@ -1,14 +1,14 @@ 'use strict' var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var local = 'http://localhost:0/asdf' tape('without uri', function (t) { t.throws(function () { request({}) - }, /^Error: options\.uri is a required argument$/) + }, /^options\.uri is a required argument$/) t.end() }) @@ -17,7 +17,7 @@ tape('invalid uri 1', function (t) { request({ uri: 'this-is-not-a-valid-uri' }) - }, /^Error: Invalid URI/) + }, /^Invalid URI/) t.end() }) @@ -26,7 +26,7 @@ tape('invalid uri 2', function (t) { request({ uri: 'github.com/uri-is-not-valid-without-protocol' }) - }, /^Error: Invalid URI/) + }, /^Invalid URI/) t.end() }) @@ -36,7 +36,7 @@ tape('invalid uri + NO_PROXY', function (t) { request({ uri: 'invalid' }) - }, /^Error: Invalid URI/) + }, /^Invalid URI/) delete process.env.NO_PROXY t.end() }) @@ -46,7 +46,7 @@ tape('deprecated unix URL', function (t) { request({ uri: 'unix://path/to/socket/and/then/request/path' }) - }, /^Error: `unix:\/\/` URL scheme is no longer supported/) + }, /^`unix:\/\/` URL scheme is no longer supported/) t.end() }) @@ -55,7 +55,7 @@ tape('invalid body', function (t) { request({ uri: local, body: {} }) - }, /^Error: Argument error, options\.body\.$/) + }, /^Argument error, options\.body\.$/) t.end() }) @@ -65,7 +65,7 @@ tape('invalid multipart', function (t) { uri: local, multipart: 'foo' }) - }, /^Error: Argument error, options\.multipart\.$/) + }, /^Argument error, options\.multipart\.$/) t.end() }) @@ -75,7 +75,7 @@ tape('multipart without body 1', function (t) { uri: local, multipart: [ {} ] }) - }, /^Error: Body attribute missing in multipart\.$/) + }, /^Body attribute missing in multipart\.$/) t.end() }) @@ -84,7 +84,7 @@ tape('multipart without body 2', function (t) { request(local, { multipart: [ {} ] }) - }, /^Error: Body attribute missing in multipart\.$/) + }, /^Body attribute missing in multipart\.$/) t.end() }) diff --git a/tests/test-event-forwarding.js b/tests/test-event-forwarding.js index c057a0bb..ac324ddc 100644 --- a/tests/test-event-forwarding.js +++ b/tests/test-event-forwarding.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-follow-all-303.js b/tests/test-follow-all-303.js index b40adf84..e64d0361 100644 --- a/tests/test-follow-all-303.js +++ b/tests/test-follow-all-303.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var server = http.createServer(function (req, res) { if (req.method === 'POST') { diff --git a/tests/test-follow-all.js b/tests/test-follow-all.js index c35d74b3..a51b7b68 100644 --- a/tests/test-follow-all.js +++ b/tests/test-follow-all.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var server = http.createServer(function (req, res) { // redirect everything 3 times, no matter what. diff --git a/tests/test-form-data-error.js b/tests/test-form-data-error.js index d6ee25d1..5330adc9 100644 --- a/tests/test-form-data-error.js +++ b/tests/test-form-data-error.js @@ -2,7 +2,7 @@ var request = require('../index') var server = require('./server') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-form-data.js b/tests/test-form-data.js index 990562be..fae34e53 100644 --- a/tests/test-form-data.js +++ b/tests/test-form-data.js @@ -5,7 +5,7 @@ var path = require('path') var mime = require('mime-types') var request = require('../index') var fs = require('fs') -var tape = require('tape') +var tape = require('tap').test function runTest (t, options) { var remoteFile = path.join(__dirname, 'googledoodle.jpg') diff --git a/tests/test-form-urlencoded.js b/tests/test-form-urlencoded.js index 5e46917b..abfe354f 100644 --- a/tests/test-form-urlencoded.js +++ b/tests/test-form-urlencoded.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test function runTest (t, options, index) { var server = http.createServer(function (req, res) { diff --git a/tests/test-form.js b/tests/test-form.js index 5f262f20..8a54e381 100644 --- a/tests/test-form.js +++ b/tests/test-form.js @@ -5,7 +5,7 @@ var path = require('path') var mime = require('mime-types') var request = require('../index') var fs = require('fs') -var tape = require('tape') +var tape = require('tap').test tape('multipart form append', function (t) { var remoteFile = path.join(__dirname, 'googledoodle.jpg') diff --git a/tests/test-gzip.js b/tests/test-gzip.js index 933b7bae..8782a8e8 100644 --- a/tests/test-gzip.js +++ b/tests/test-gzip.js @@ -5,7 +5,7 @@ var http = require('http') var zlib = require('zlib') var assert = require('assert') var bufferEqual = require('buffer-equal') -var tape = require('tape') +var tape = require('tap').test var testContent = 'Compressible response content.\n' var testContentBig diff --git a/tests/test-har.js b/tests/test-har.js index 61f0d7d6..54537f16 100644 --- a/tests/test-har.js +++ b/tests/test-har.js @@ -2,7 +2,7 @@ var path = require('path') var request = require('..') -var tape = require('tape') +var tape = require('tap').test var fixture = require('./fixtures/har.json') var server = require('./server') diff --git a/tests/test-hawk.js b/tests/test-hawk.js index 3765908c..668ae5a6 100644 --- a/tests/test-hawk.js +++ b/tests/test-hawk.js @@ -3,7 +3,7 @@ var http = require('http') var request = require('../index') var hawk = require('../lib/hawk') -var tape = require('tape') +var tape = require('tap').test var assert = require('assert') var server = http.createServer(function (req, res) { diff --git a/tests/test-headers.js b/tests/test-headers.js index 68b74869..ac5e0d11 100644 --- a/tests/test-headers.js +++ b/tests/test-headers.js @@ -3,7 +3,7 @@ var server = require('./server') var request = require('../index') var util = require('util') -var tape = require('tape') +var tape = require('tap').test var url = require('url') var os = require('os') diff --git a/tests/test-http-signature.js b/tests/test-http-signature.js index 5ce015cb..05ddd593 100644 --- a/tests/test-http-signature.js +++ b/tests/test-http-signature.js @@ -3,7 +3,7 @@ var http = require('http') var request = require('../index') var httpSignature = require('http-signature') -var tape = require('tape') +var tape = require('tap').test var privateKeyPEMs = {} diff --git a/tests/test-httpModule.js b/tests/test-httpModule.js index 4d4e236b..91e377f8 100644 --- a/tests/test-httpModule.js +++ b/tests/test-httpModule.js @@ -5,7 +5,7 @@ var https = require('https') var destroyable = require('server-destroy') var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var fauxRequestsMade diff --git a/tests/test-https.js b/tests/test-https.js index 028bc775..2abcc7ee 100644 --- a/tests/test-https.js +++ b/tests/test-https.js @@ -7,7 +7,7 @@ var server = require('./server') var request = require('../index') var fs = require('fs') var path = require('path') -var tape = require('tape') +var tape = require('tap').test var s = server.createSSLServer() var caFile = path.resolve(__dirname, 'ssl/ca/ca.crt') diff --git a/tests/test-isUrl.js b/tests/test-isUrl.js index ae7f3ba1..f9ced532 100644 --- a/tests/test-isUrl.js +++ b/tests/test-isUrl.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var s = http.createServer(function (req, res) { res.statusCode = 200 diff --git a/tests/test-json-request.js b/tests/test-json-request.js index af82f15b..0c43e035 100644 --- a/tests/test-json-request.js +++ b/tests/test-json-request.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-localAddress.js b/tests/test-localAddress.js index 88a33532..1818a8f7 100644 --- a/tests/test-localAddress.js +++ b/tests/test-localAddress.js @@ -1,6 +1,6 @@ 'use strict' var request = require('../index') -var tape = require('tape') +var tape = require('tap').test tape('bind to invalid address', function (t) { request.get({ diff --git a/tests/test-multipart-encoding.js b/tests/test-multipart-encoding.js index c88a6f14..a7ec5987 100644 --- a/tests/test-multipart-encoding.js +++ b/tests/test-multipart-encoding.js @@ -4,7 +4,7 @@ var http = require('http') var path = require('path') var request = require('../index') var fs = require('fs') -var tape = require('tape') +var tape = require('tap').test var localFile = path.join(__dirname, 'unicycle.jpg') var cases = { diff --git a/tests/test-multipart.js b/tests/test-multipart.js index 8eff422e..63e4f30f 100644 --- a/tests/test-multipart.js +++ b/tests/test-multipart.js @@ -4,7 +4,7 @@ var http = require('http') var path = require('path') var request = require('../index') var fs = require('fs') -var tape = require('tape') +var tape = require('tap').test function runTest (t, a) { var remoteFile = path.join(__dirname, 'googledoodle.jpg') diff --git a/tests/test-node-debug.js b/tests/test-node-debug.js index bcc6a401..fe3cb5b3 100644 --- a/tests/test-node-debug.js +++ b/tests/test-node-debug.js @@ -2,7 +2,7 @@ var request = require('../index') var http = require('http') -var tape = require('tape') +var tape = require('tap').test var s = http.createServer(function (req, res) { res.statusCode = 200 diff --git a/tests/test-oauth.js b/tests/test-oauth.js index 0358375e..50764985 100644 --- a/tests/test-oauth.js +++ b/tests/test-oauth.js @@ -5,7 +5,7 @@ var qs = require('querystring') var fs = require('fs') var path = require('path') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var http = require('http') function getSignature (r) { diff --git a/tests/test-onelineproxy.js b/tests/test-onelineproxy.js index b2219f24..3d3a8439 100644 --- a/tests/test-onelineproxy.js +++ b/tests/test-onelineproxy.js @@ -3,7 +3,7 @@ var http = require('http') var assert = require('assert') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var server = http.createServer(function (req, resp) { resp.statusCode = 200 diff --git a/tests/test-option-reuse.js b/tests/test-option-reuse.js index 1c9b09d6..3a0f23f1 100644 --- a/tests/test-option-reuse.js +++ b/tests/test-option-reuse.js @@ -2,7 +2,7 @@ var request = require('../index') var http = require('http') -var tape = require('tape') +var tape = require('tap').test var methodsSeen = { head: 0, diff --git a/tests/test-options-convenience-method.js b/tests/test-options-convenience-method.js index 43231f27..11059a53 100644 --- a/tests/test-options-convenience-method.js +++ b/tests/test-options-convenience-method.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var destroyable = require('server-destroy') var s = server.createServer() diff --git a/tests/test-params.js b/tests/test-params.js index 4659aa70..ec12b38a 100644 --- a/tests/test-params.js +++ b/tests/test-params.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-piped-redirect.js b/tests/test-piped-redirect.js index 77135d4d..971f855a 100644 --- a/tests/test-piped-redirect.js +++ b/tests/test-piped-redirect.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var port1 var port2 diff --git a/tests/test-pipes.js b/tests/test-pipes.js index 0ee3dd6c..1378f2fe 100644 --- a/tests/test-pipes.js +++ b/tests/test-pipes.js @@ -6,7 +6,7 @@ var fs = require('fs') var request = require('../index') var path = require('path') var util = require('util') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() @@ -371,7 +371,9 @@ tape('request.pipefilter is called correctly', function (t) { r3.pipefilter = function (res, dest) { t.equal(res, r3.response) t.equal(dest, validatePipeFilter) - t.end() + setTimeout(() => { + t.end() + }, 0) } }) diff --git a/tests/test-pool.js b/tests/test-pool.js index f2d96bd1..adf236cd 100644 --- a/tests/test-pool.js +++ b/tests/test-pool.js @@ -2,7 +2,7 @@ var request = require('../index') var http = require('http') -var tape = require('tape') +var tape = require('tap').test var s = http.createServer(function (req, res) { res.statusCode = 200 diff --git a/tests/test-promise.js b/tests/test-promise.js index 028d15fb..a7baa2f9 100644 --- a/tests/test-promise.js +++ b/tests/test-promise.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var Promise = require('bluebird') var s = http.createServer(function (req, res) { diff --git a/tests/test-proxy-connect.js b/tests/test-proxy-connect.js index 06800d00..1061b846 100644 --- a/tests/test-proxy-connect.js +++ b/tests/test-proxy-connect.js @@ -1,7 +1,7 @@ 'use strict' var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var called = false var proxiedHost = 'google.com' diff --git a/tests/test-proxy.js b/tests/test-proxy.js index 77cb7a83..cf9c8f90 100644 --- a/tests/test-proxy.js +++ b/tests/test-proxy.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() var currResponseHandler diff --git a/tests/test-qs.js b/tests/test-qs.js index f70c685d..8f213150 100644 --- a/tests/test-qs.js +++ b/tests/test-qs.js @@ -1,7 +1,7 @@ 'use strict' var request = require('../index') -var tape = require('tape') +var tape = require('tap').test // Run a querystring test. `options` can have the following keys: // - suffix : a string to be added to the URL diff --git a/tests/test-redirect-auth.js b/tests/test-redirect-auth.js index 7aef6edc..e58f9434 100644 --- a/tests/test-redirect-auth.js +++ b/tests/test-redirect-auth.js @@ -3,7 +3,7 @@ var server = require('./server') var request = require('../index') var util = require('util') -var tape = require('tape') +var tape = require('tap').test var destroyable = require('server-destroy') var s = server.createServer() diff --git a/tests/test-redirect-complex.js b/tests/test-redirect-complex.js index 072b5986..0ad29a70 100644 --- a/tests/test-redirect-complex.js +++ b/tests/test-redirect-complex.js @@ -3,7 +3,7 @@ var server = require('./server') var request = require('../index') var events = require('events') -var tape = require('tape') +var tape = require('tap').test var destroyable = require('server-destroy') var s = server.createServer() diff --git a/tests/test-redirect.js b/tests/test-redirect.js index b7b5ca67..95b1e6e2 100644 --- a/tests/test-redirect.js +++ b/tests/test-redirect.js @@ -3,7 +3,7 @@ var server = require('./server') var assert = require('assert') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var http = require('http') var destroyable = require('server-destroy') diff --git a/tests/test-rfc3986.js b/tests/test-rfc3986.js index a3918628..fd954384 100644 --- a/tests/test-rfc3986.js +++ b/tests/test-rfc3986.js @@ -2,7 +2,7 @@ var http = require('http') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test function runTest (t, options) { var server = http.createServer(function (req, res) { diff --git a/tests/test-stream.js b/tests/test-stream.js index 1d7bf3de..ef2f84e6 100644 --- a/tests/test-stream.js +++ b/tests/test-stream.js @@ -1,7 +1,7 @@ var fs = require('fs') var path = require('path') var http = require('http') -var tape = require('tape') +var tape = require('tap').test var request = require('../') var server diff --git a/tests/test-timeout.js b/tests/test-timeout.js index 2ab0639c..5e524bef 100644 --- a/tests/test-timeout.js +++ b/tests/test-timeout.js @@ -21,7 +21,7 @@ function checkEventHandlers (t, socket) { var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var s = server.createServer() diff --git a/tests/test-timing.js b/tests/test-timing.js index f3e77f92..f8677fbb 100644 --- a/tests/test-timing.js +++ b/tests/test-timing.js @@ -2,7 +2,7 @@ var server = require('./server') var request = require('../index') -var tape = require('tape') +var tape = require('tap').test var http = require('http') var plainServer = server.createServer() diff --git a/tests/test-toJSON.js b/tests/test-toJSON.js index 43fa7916..1362ddc3 100644 --- a/tests/test-toJSON.js +++ b/tests/test-toJSON.js @@ -2,7 +2,7 @@ var request = require('../index') var http = require('http') -var tape = require('tape') +var tape = require('tap').test var s = http.createServer(function (req, resp) { resp.statusCode = 200 diff --git a/tests/test-tunnel.js b/tests/test-tunnel.js index fa2ebce3..b349269d 100644 --- a/tests/test-tunnel.js +++ b/tests/test-tunnel.js @@ -1,7 +1,7 @@ 'use strict' var server = require('./server') -var tape = require('tape') +var tape = require('tap').test var request = require('../index') var https = require('https') var net = require('net') @@ -454,12 +454,16 @@ tape('setup', function (t) { s.destroy(function () { ss.destroy(function () { ss2.destroy(function () { - t.end() + setTimeout(() => { + t.end() + }, 0) }) }) }) }) - t.end() + setTimeout(() => { + t.end() + }, 0) }) }) }) diff --git a/tests/test-unix.js b/tests/test-unix.js index acf88327..0de8d0c7 100644 --- a/tests/test-unix.js +++ b/tests/test-unix.js @@ -5,7 +5,7 @@ var http = require('http') var fs = require('fs') var rimraf = require('rimraf') var assert = require('assert') -var tape = require('tape') +var tape = require('tap').test var url = require('url') var rawPath = [null, 'raw', 'path'].join('/')