diff --git a/test/disabled/test-http-big-proxy-responses.js b/test/disabled/test-http-big-proxy-responses.js index 74ecf28071..9140f7b6b6 100644 --- a/test/disabled/test-http-big-proxy-responses.js +++ b/test/disabled/test-http-big-proxy-responses.js @@ -43,21 +43,24 @@ chargen.listen(9000, ready); // Proxy to the chargen server. var proxy = http.createServer(function(req, res) { - var c = http.createClient(9000, 'localhost'); - var len = parseInt(req.headers['x-len'], 10); assert.ok(len > 0); var sent = 0; - c.addListener('error', function(e) { + function onError(e) { console.log('proxy client error. sent ' + sent); throw e; - }); + } - var proxy_req = c.request(req.method, req.url, req.headers); - proxy_req.addListener('response', function(proxy_res) { + var proxy_req = http.request({ + host: 'localhost', + port: 9000, + method: req.method, + path: req.url, + headers: req.headers + }, function(proxy_res) { res.writeHead(proxy_res.statusCode, proxy_res.headers); var count = 0; @@ -74,7 +77,7 @@ var proxy = http.createServer(function(req, res) { }); }); - + proxy_req.on('error', onError); proxy_req.end(); }); proxy.listen(9001, ready); @@ -89,9 +92,12 @@ function call_chargen(list) { var recved = 0; - var req = http.createClient(9001, 'localhost').request('/', {'x-len': len}); - - req.addListener('response', function(res) { + var req = http.request({ + port: 9001, + host: 'localhost', + path: '/', + headers: {'x-len': len} + }, function(res) { res.addListener('data', function(d) { recved += d.length; @@ -115,7 +121,7 @@ function call_chargen(list) { } } -serversRunning = 0; +var serversRunning = 0; function ready() { if (++serversRunning < 2) return; call_chargen([100, 1000, 10000, 100000, 1000000]); diff --git a/test/disabled/test-http-head-request.js b/test/disabled/test-http-head-request.js index 045c9dc354..73f0322b75 100644 --- a/test/disabled/test-http-head-request.js +++ b/test/disabled/test-http-head-request.js @@ -42,9 +42,11 @@ server.listen(common.PORT); var gotEnd = false; server.addListener('listening', function() { - var client = http.createClient(common.PORT); - var request = client.request('HEAD', '/'); - request.addListener('response', function(response) { + var request = http.request({ + port: common.PORT, + method: 'HEAD', + path: '/' + }, function(response) { console.log('got response'); response.addListener('data', function() { process.exit(2); diff --git a/test/pummel/test-http-upload-timeout.js b/test/pummel/test-http-upload-timeout.js index c7dededd07..fa5bb85ecd 100644 --- a/test/pummel/test-http-upload-timeout.js +++ b/test/pummel/test-http-upload-timeout.js @@ -48,8 +48,11 @@ server.listen(common.PORT, '127.0.0.1', function() { connections++; setTimeout(function() { - var client = http.createClient(common.PORT), - request = client.request('POST', '/'); + var request = http.request({ + port: common.PORT, + method: 'POST', + path: '/' + }); function ping() { var nextPing = (Math.random() * 900).toFixed(); diff --git a/test/simple/test-http-allow-req-after-204-res.js b/test/simple/test-http-allow-req-after-204-res.js index c9cbf9b5d1..ece06014c3 100644 --- a/test/simple/test-http-allow-req-after-204-res.js +++ b/test/simple/test-http-allow-req-after-204-res.js @@ -38,14 +38,15 @@ var server = http.createServer(function(req, res) { res.end(); }); -var client = http.createClient(common.PORT); - function nextRequest() { var method = methods.shift(); console.error('writing request: %s', method); - var request = client.request(method, '/'); - request.on('response', function(response) { + var request = http.request({ + port: common.PORT, + method: method, + path: '/' + }, function(response) { response.on('end', function() { if (methods.length == 0) { console.error('close server'); diff --git a/test/simple/test-http-buffer-sanity.js b/test/simple/test-http-buffer-sanity.js index f458f9424f..2209456b35 100644 --- a/test/simple/test-http-buffer-sanity.js +++ b/test/simple/test-http-buffer-sanity.js @@ -68,11 +68,12 @@ var gotThanks = false; web.listen(common.PORT, function() { console.log('Making request'); - var client = http.createClient(common.PORT); - var req = client.request('GET', '/', { 'content-length': buffer.length }); - req.end(buffer); - - req.on('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'GET', + path: '/', + headers: { 'content-length': buffer.length } + }, function(res) { console.log('Got response'); res.setEncoding('utf8'); res.on('data', function(string) { @@ -80,6 +81,7 @@ web.listen(common.PORT, function() { gotThanks = true; }); }); + req.end(buffer); }); diff --git a/test/simple/test-http-client-parse-error.js b/test/simple/test-http-client-parse-error.js index 1f845debef..1bfdd146e2 100644 --- a/test/simple/test-http-client-parse-error.js +++ b/test/simple/test-http-client-parse-error.js @@ -37,10 +37,14 @@ var srv = net.createServer(function(c) { var parseError = false; srv.listen(common.PORT, '127.0.0.1', function() { - var hc = http.createClient(common.PORT, '127.0.0.1'); - hc.request('GET', '/').end(); - - hc.on('error', function(e) { + var req = http.request({ + host: '127.0.0.1', + port: common.PORT, + method: 'GET', + path: '/'}); + req.end(); + + req.on('error', function(e) { console.log('got error from client'); srv.close(); assert.ok(e.message.indexOf('Parse Error') >= 0); diff --git a/test/simple/test-http-client-race.js b/test/simple/test-http-client-race.js index 1bed5ccefa..9477b63b47 100644 --- a/test/simple/test-http-client-race.js +++ b/test/simple/test-http-client-race.js @@ -39,9 +39,7 @@ var body1 = ''; var body2 = ''; server.addListener('listening', function() { - var client = http.createClient(common.PORT); - - var req1 = client.request('/1'); + var req1 = http.request({ port: common.PORT, path: '/1' }); req1.end(); req1.addListener('response', function(res1) { res1.setEncoding('utf8'); @@ -51,7 +49,7 @@ server.addListener('listening', function() { }); res1.addListener('end', function() { - var req2 = client.request('/2'); + var req2 = http.request({ port: common.PORT, path: '/2' }); req2.end(); req2.addListener('response', function(res2) { res2.setEncoding('utf8'); diff --git a/test/simple/test-http-client-upload-buf.js b/test/simple/test-http-client-upload-buf.js index 73c5e57abc..cb7e931787 100644 --- a/test/simple/test-http-client-upload-buf.js +++ b/test/simple/test-http-client-upload-buf.js @@ -46,15 +46,11 @@ var server = http.createServer(function(req, res) { server.listen(common.PORT); server.addListener('listening', function() { - var client = http.createClient(common.PORT); - var req = client.request('POST', '/'); - - req.write(new Buffer(N)); - req.end(); - - common.error('client finished sending request'); - - req.addListener('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'POST', + path: '/' + }, function(res) { res.setEncoding('utf8'); res.addListener('data', function(chunk) { console.log(chunk); @@ -64,6 +60,11 @@ server.addListener('listening', function() { server.close(); }); }); + + req.write(new Buffer(N)); + req.end(); + + common.error('client finished sending request'); }); process.addListener('exit', function() { diff --git a/test/simple/test-http-client-upload.js b/test/simple/test-http-client-upload.js index d1f1264980..e160d9fe55 100644 --- a/test/simple/test-http-client-upload.js +++ b/test/simple/test-http-client-upload.js @@ -47,16 +47,11 @@ var server = http.createServer(function(req, res) { server.listen(common.PORT); server.addListener('listening', function() { - var client = http.createClient(common.PORT); - var req = client.request('POST', '/'); - req.write('1\n'); - req.write('2\n'); - req.write('3\n'); - req.end(); - - common.error('client finished sending request'); - - req.addListener('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'POST', + path: '/' + }, function(res) { res.setEncoding('utf8'); res.addListener('data', function(chunk) { console.log(chunk); @@ -66,6 +61,13 @@ server.addListener('listening', function() { server.close(); }); }); + + req.write('1\n'); + req.write('2\n'); + req.write('3\n'); + req.end(); + + common.error('client finished sending request'); }); process.addListener('exit', function() { diff --git a/test/simple/test-http-contentLength0.js b/test/simple/test-http-contentLength0.js index ce11afc347..4d6e616d53 100644 --- a/test/simple/test-http-contentLength0.js +++ b/test/simple/test-http-contentLength0.js @@ -33,10 +33,7 @@ var s = http.createServer(function(req, res) { }); s.listen(common.PORT, function() { - var r = http.createClient(common.PORT); - var request = r.request('GET', '/'); - - request.on('response', function(response) { + var request = http.request({ port: common.PORT }, function(response) { console.log('STATUS: ' + response.statusCode); s.close(); }); diff --git a/test/simple/test-http-exceptions.js b/test/simple/test-http-exceptions.js index 4cc3a4ccee..0045b65912 100644 --- a/test/simple/test-http-exceptions.js +++ b/test/simple/test-http-exceptions.js @@ -33,8 +33,7 @@ var server = http.createServer(function(req, res) { server.listen(common.PORT, function() { var req; for (var i = 0; i < 4; i += 1) { - req = http.createClient(common.PORT).request('GET', '/busy/' + i); - req.end(); + req = http.get({ port: common.PORT, path: '/busy/' + i }); } }); diff --git a/test/simple/test-http-expect-continue.js b/test/simple/test-http-expect-continue.js index f313a16d2c..6d7bd51849 100644 --- a/test/simple/test-http-expect-continue.js +++ b/test/simple/test-http-expect-continue.js @@ -51,9 +51,11 @@ server.listen(common.PORT); server.addListener('listening', function() { - var client = http.createClient(common.PORT); - var req = client.request('POST', '/world', { - 'Expect': '100-continue' + var req = http.request({ + port: common.PORT, + method: 'POST', + path: '/world', + headers: { 'Expect': '100-continue' } }); common.debug('Client sending request...'); outstanding_reqs++; diff --git a/test/simple/test-http-head-request.js b/test/simple/test-http-head-request.js index b42ae06e5e..09975ca74a 100644 --- a/test/simple/test-http-head-request.js +++ b/test/simple/test-http-head-request.js @@ -37,16 +37,18 @@ var server = http.createServer(function(req, res) { var gotEnd = false; server.listen(common.PORT, function() { - var client = http.createClient(common.PORT); - var request = client.request('HEAD', '/'); - request.end(); - request.addListener('response', function(response) { + var request = http.request({ + port: common.PORT, + method: 'HEAD', + path: '/' + }, function(response) { common.error('response start'); response.addListener('end', function() { common.error('response end'); gotEnd = true; }); }); + request.end(); }); process.addListener('exit', function() { diff --git a/test/simple/test-http-head-response-has-no-body-end.js b/test/simple/test-http-head-response-has-no-body-end.js index ed91394ce2..1a17524715 100644 --- a/test/simple/test-http-head-response-has-no-body-end.js +++ b/test/simple/test-http-head-response-has-no-body-end.js @@ -37,10 +37,11 @@ server.listen(common.PORT); var responseComplete = false; server.addListener('listening', function() { - var req = http.createClient(common.PORT).request('HEAD', '/'); - common.error('req'); - req.end(); - req.addListener('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'HEAD', + path: '/' + }, function(res) { common.error('response'); res.addListener('end', function() { common.error('response end'); @@ -48,6 +49,8 @@ server.addListener('listening', function() { responseComplete = true; }); }); + common.error('req'); + req.end(); }); process.addListener('exit', function() { diff --git a/test/simple/test-http-head-response-has-no-body.js b/test/simple/test-http-head-response-has-no-body.js index 5b07341875..0317071db1 100644 --- a/test/simple/test-http-head-response-has-no-body.js +++ b/test/simple/test-http-head-response-has-no-body.js @@ -37,10 +37,11 @@ server.listen(common.PORT); var responseComplete = false; server.addListener('listening', function() { - var req = http.createClient(common.PORT).request('HEAD', '/'); - common.error('req'); - req.end(); - req.addListener('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'HEAD', + path: '/' + }, function(res) { common.error('response'); res.addListener('end', function() { common.error('response end'); @@ -48,6 +49,8 @@ server.addListener('listening', function() { responseComplete = true; }); }); + common.error('req'); + req.end(); }); process.addListener('exit', function() { diff --git a/test/simple/test-http-proxy.js b/test/simple/test-http-proxy.js index 96a13d03f5..ce5a6d62b9 100644 --- a/test/simple/test-http-proxy.js +++ b/test/simple/test-http-proxy.js @@ -43,12 +43,12 @@ var backend = http.createServer(function(req, res) { res.end(); }); -var proxy_client = http.createClient(BACKEND_PORT); var proxy = http.createServer(function(req, res) { common.debug('proxy req headers: ' + JSON.stringify(req.headers)); - var proxy_req = proxy_client.request(url.parse(req.url).pathname); - proxy_req.end(); - proxy_req.addListener('response', function(proxy_res) { + var proxy_req = http.get({ + port: BACKEND_PORT, + path: url.parse(req.url).pathname + }, function(proxy_res) { common.debug('proxy res headers: ' + JSON.stringify(proxy_res.headers)); @@ -76,10 +76,10 @@ function startReq() { nlistening++; if (nlistening < 2) return; - var client = http.createClient(PROXY_PORT); - var req = client.request('/test'); - common.debug('client req'); - req.addListener('response', function(res) { + var client = http.get({ + port: PROXY_PORT, + path: '/test' + }, function(res) { common.debug('got res'); assert.equal(200, res.statusCode); @@ -95,7 +95,7 @@ function startReq() { common.debug('closed both'); }); }); - req.end(); + common.debug('client req'); } common.debug('listen proxy'); diff --git a/test/simple/test-http-server-multiheaders.js b/test/simple/test-http-server-multiheaders.js index 4c09a2f9d5..a2930f1d55 100644 --- a/test/simple/test-http-server-multiheaders.js +++ b/test/simple/test-http-server-multiheaders.js @@ -40,18 +40,20 @@ var srv = http.createServer(function(req, res) { }); srv.listen(common.PORT, function() { - var hc = http.createClient(common.PORT, 'localhost'); - var hr = hc.request('/', - [ - ['accept', 'abc'], - ['accept', 'def'], - ['Accept', 'ghijklmnopqrst'], - ['host', 'foo'], - ['Host', 'bar'], - ['hOst', 'baz'], - ['x-foo', 'bingo'], - ['x-bar', 'banjo'], - ['x-bar', 'bango'] - ]); - hr.end(); + http.get({ + host: 'localhost', + port: common.PORT, + path: '/', + headers: [ + ['accept', 'abc'], + ['accept', 'def'], + ['Accept', 'ghijklmnopqrst'], + ['host', 'foo'], + ['Host', 'bar'], + ['hOst', 'baz'], + ['x-foo', 'bingo'], + ['x-bar', 'banjo'], + ['x-bar', 'bango'] + ] + }); }); diff --git a/test/simple/test-http-set-cookies.js b/test/simple/test-http-set-cookies.js index 894bfe4374..13fc8b6eed 100644 --- a/test/simple/test-http-set-cookies.js +++ b/test/simple/test-http-set-cookies.js @@ -43,11 +43,7 @@ server.addListener('listening', function() { // // one set-cookie header // - var client = http.createClient(common.PORT); - var req = client.request('GET', '/one'); - req.end(); - - req.addListener('response', function(res) { + http.get({ port: common.PORT, path: '/one' }, function(res) { // set-cookie headers are always return in an array. // even if there is only one. assert.deepEqual(['A'], res.headers['set-cookie']); @@ -66,11 +62,7 @@ server.addListener('listening', function() { // two set-cookie headers - var client = http.createClient(common.PORT); - var req = client.request('GET', '/two'); - req.end(); - - req.addListener('response', function(res) { + http.get({ port: common.PORT, path: '/two' }, function(res) { assert.deepEqual(['A', 'B'], res.headers['set-cookie']); assert.equal('text/plain', res.headers['content-type']); diff --git a/test/simple/test-http-set-trailers.js b/test/simple/test-http-set-trailers.js index 89703d0dd9..19ad4f0173 100644 --- a/test/simple/test-http-set-trailers.js +++ b/test/simple/test-http-set-trailers.js @@ -96,11 +96,7 @@ server.addListener('listening', function() { // now, see if the client sees the trailers. server.addListener('listening', function() { - var client = http.createClient(common.PORT); - var req = client.request('/hello', {}); - req.end(); - outstanding_reqs++; - req.addListener('response', function(res) { + http.get({ port: common.PORT, path: '/hello', headers: {} }, function(res) { res.addListener('end', function() { //console.log(res.trailers); assert.ok('x-foo' in res.trailers, 'Client doesn\'t see trailers.'); @@ -111,4 +107,5 @@ server.addListener('listening', function() { } }); }); + outstanding_reqs++; }); diff --git a/test/simple/test-http-upgrade-client.js b/test/simple/test-http-upgrade-client.js index 0bfeabb83a..f7178d9985 100644 --- a/test/simple/test-http-upgrade-client.js +++ b/test/simple/test-http-upgrade-client.js @@ -52,8 +52,8 @@ var gotUpgrade = false; srv.listen(common.PORT, '127.0.0.1', function() { - var hc = http.createClient(common.PORT, '127.0.0.1').request('GET', '/'); - hc.addListener('upgrade', function(res, socket, upgradeHead) { + var req = http.get({ port: common.PORT }); + req.addListener('upgrade', function(res, socket, upgradeHead) { // XXX: This test isn't fantastic, as it assumes that the entire response // from the server will arrive in a single data callback assert.equal(upgradeHead, 'nurtzo'); @@ -69,7 +69,6 @@ srv.listen(common.PORT, '127.0.0.1', function() { gotUpgrade = true; }); - hc.end(); }); process.addListener('exit', function() { diff --git a/test/simple/test-http-upgrade-client2.js b/test/simple/test-http-upgrade-client2.js index 6f0d4110ab..080bbcc7eb 100644 --- a/test/simple/test-http-upgrade-client2.js +++ b/test/simple/test-http-upgrade-client2.js @@ -42,29 +42,28 @@ server.listen(common.PORT, function() { function upgradeRequest(fn) { console.log("req"); var header = { 'Connection': 'Upgrade', 'Upgrade': 'Test' }; - var request = http.createClient(common.PORT).request('GET', '/', header); - var client = request; + var request = http.request({ port: common.PORT, headers: header }); var wasUpgrade = false; function onUpgrade(res, socket, head) { console.log("client upgraded"); wasUpgrade = true; - client.removeListener('upgrade', onUpgrade); + request.removeListener('upgrade', onUpgrade); socket.end(); } - client.on('upgrade', onUpgrade); + request.on('upgrade', onUpgrade); function onEnd() { console.log("client end"); - client.removeListener('end', onEnd); + request.removeListener('end', onEnd); if (!wasUpgrade) { throw new Error('hasn\'t received upgrade event'); } else { fn && process.nextTick(fn); } } - client.on('close', onEnd); + request.on('close', onEnd); request.write('head'); diff --git a/test/simple/test-http-write-empty-string.js b/test/simple/test-http-write-empty-string.js index a5193a7dc0..2bee46d6cb 100644 --- a/test/simple/test-http-write-empty-string.js +++ b/test/simple/test-http-write-empty-string.js @@ -45,10 +45,7 @@ process.addListener('exit', function() { server.listen(common.PORT, function() { - var client = http.createClient(common.PORT); - var req = client.request('/'); - req.end(); - req.addListener('response', function(res) { + http.get({ port: common.PORT }, function(res) { assert.equal(200, res.statusCode); res.setEncoding('ascii'); res.addListener('data', function(chunk) { diff --git a/test/simple/test-http.js b/test/simple/test-http.js index df6bb12c34..2c4f19c8dd 100644 --- a/test/simple/test-http.js +++ b/test/simple/test-http.js @@ -64,10 +64,13 @@ var server = http.Server(function(req, res) { server.listen(common.PORT); server.addListener('listening', function() { - var client = http.createClient(common.PORT); - var req = client.request('/hello', {'Accept': '*/*', 'Foo': 'bar'}); - req.end(); - req.addListener('response', function(res) { + var agent = new http.Agent({ port: common.PORT, maxSockets: 1 }); + http.get({ + port: common.PORT, + path: '/hello', + headers: {'Accept': '*/*', 'Foo': 'bar'}, + agent: agent + }, function(res) { assert.equal(200, res.statusCode); responses_recvd += 1; res.setEncoding('utf8'); @@ -76,15 +79,19 @@ server.addListener('listening', function() { }); setTimeout(function() { - req = client.request('POST', '/world'); - req.end(); - req.addListener('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'POST', + path: '/world', + agent: agent + }, function(res) { assert.equal(200, res.statusCode); responses_recvd += 1; res.setEncoding('utf8'); res.addListener('data', function(chunk) { body1 += chunk; }); common.debug('Got /world response'); }); + req.end(); }, 1); }); diff --git a/test/simple/test-listen-fd.js b/test/simple/test-listen-fd.js index 3e13921b15..ae337a2d2e 100644 --- a/test/simple/test-listen-fd.js +++ b/test/simple/test-listen-fd.js @@ -44,8 +44,7 @@ netBinding.listen(fd, 128); srv.listenFD(fd); // Make an HTTP request to the server above -var hc = http.createClient(common.PORT, '127.0.0.1'); -hc.request('/').end(); +http.get({ port: common.PORT, host: '127.0.0.1', path: '/'}); // Verify that we're exiting after having received an HTTP request process.addListener('exit', function() { diff --git a/test/simple/test-pipe.js b/test/simple/test-pipe.js index d28abff50a..b4a2c1a7f8 100644 --- a/test/simple/test-pipe.js +++ b/test/simple/test-pipe.js @@ -107,12 +107,12 @@ function startClient() { console.log('Making request'); - var client = http.createClient(common.PORT); - var req = client.request('GET', '/', { 'content-length': buffer.length }); - req.write(buffer); - req.end(); - - req.on('response', function(res) { + var req = http.request({ + port: common.PORT, + method: 'GET', + path: '/', + headers: { 'content-length': buffer.length } + }, function(res) { console.log('Got response'); res.setEncoding('utf8'); res.on('data', function(string) { @@ -120,6 +120,8 @@ function startClient() { gotThanks = true; }); }); + req.write(buffer); + req.end(); } process.on('exit', function() { diff --git a/test/simple/test-zerolengthbufferbug.js b/test/simple/test-zerolengthbufferbug.js index 819ef25dc3..395e35baf5 100644 --- a/test/simple/test-zerolengthbufferbug.js +++ b/test/simple/test-zerolengthbufferbug.js @@ -37,12 +37,7 @@ var gotResponse = false; var resBodySize = 0; server.listen(common.PORT, function() { - var client = http.createClient(common.PORT); - - var req = client.request('GET', '/'); - req.end(); - - req.on('response', function(res) { + http.get({ port: common.PORT }, function(res) { gotResponse = true; res.on('data', function(d) { @@ -60,4 +55,3 @@ process.on('exit', function() { assert.equal(0, resBodySize); }); -