From 33d5c46e8cc92f5bc079b873f8baa20bee2f86ae Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Thu, 18 Mar 2010 14:01:17 -0700 Subject: [PATCH] All tests to use http2 --- test/simple/test-http-1.0.js | 4 ++-- test/simple/test-http-chunked.js | 4 ++-- test/simple/test-http-client-race.js | 2 +- test/simple/test-http-eof-on-connect.js | 8 ++++---- test/simple/test-http-malformed-request.js | 6 +++--- test/simple/test-http-proxy.js | 2 +- test/simple/test-http-server.js | 6 +++--- test/simple/test-http-wget.js | 6 +++--- test/simple/test-http.js | 2 +- test/simple/test-remote-module-loading.js | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/simple/test-http-1.0.js b/test/simple/test-http-1.0.js index b3f69c23cfe..106313d2817 100644 --- a/test/simple/test-http-1.0.js +++ b/test/simple/test-http-1.0.js @@ -1,5 +1,5 @@ require("../common"); -tcp = require("tcp"); +net = require("net"); http = require("http2"); var body = "hello world\n"; @@ -13,7 +13,7 @@ var server = http.createServer(function (req, res) { }) server.listen(PORT); -var c = tcp.createConnection(PORT); +var c = net.createConnection(PORT); c.setEncoding("utf8"); diff --git a/test/simple/test-http-chunked.js b/test/simple/test-http-chunked.js index 28d4cc6424c..4325d113dab 100644 --- a/test/simple/test-http-chunked.js +++ b/test/simple/test-http-chunked.js @@ -1,5 +1,5 @@ require("../common"); -var http = require("http"); +var http = require("http2"); var UTF8_STRING = "Il était tué"; @@ -10,7 +10,7 @@ var server = http.createServer(function(req, res) { }); server.listen(PORT); -http.cat("http://localhost:"+PORT+"/", "utf8", function (err, data) { +http.cat("http://127.0.0.1:"+PORT+"/", "utf8", function (err, data) { if (err) throw err; assert.equal(UTF8_STRING, data); server.close(); diff --git a/test/simple/test-http-client-race.js b/test/simple/test-http-client-race.js index 9076924b37e..a3824cfce1e 100644 --- a/test/simple/test-http-client-race.js +++ b/test/simple/test-http-client-race.js @@ -1,5 +1,5 @@ require("../common"); -http = require("http"); +http = require("http2"); url = require("url"); var body1_s = "1111111111111111"; diff --git a/test/simple/test-http-eof-on-connect.js b/test/simple/test-http-eof-on-connect.js index 67d4b28fe91..7838c8d141c 100644 --- a/test/simple/test-http-eof-on-connect.js +++ b/test/simple/test-http-eof-on-connect.js @@ -1,6 +1,6 @@ require("../common"); -tcp = require("tcp"); -http = require("http"); +net = require("net"); +http = require("http2"); // This is a regression test for http://github.com/ry/node/issues/#issue/44 // It is separate from test-http-malformed-request.js because it is only @@ -9,8 +9,8 @@ http = require("http"); server = http.createServer(function (req, res) {}); server.listen(PORT); -tcp.createConnection(PORT).addListener("connect", function () { - this.close(); +net.createConnection(PORT).addListener("connect", function () { + this.close(); }).addListener("close", function () { server.close(); }); diff --git a/test/simple/test-http-malformed-request.js b/test/simple/test-http-malformed-request.js index a1d4b8c91a8..98d6da780c0 100644 --- a/test/simple/test-http-malformed-request.js +++ b/test/simple/test-http-malformed-request.js @@ -1,6 +1,6 @@ require("../common"); -tcp = require("tcp"); -http = require("http"); +net = require("net"); +http = require("http2"); url = require("url"); // Make sure no exceptions are thrown when receiving malformed HTTP @@ -20,7 +20,7 @@ var s = http.createServer(function (req, res) { }); s.listen(PORT); -var c = tcp.createConnection(PORT); +var c = net.createConnection(PORT); c.addListener("connect", function () { c.write("GET /hello?foo=%99bar HTTP/1.1\r\n\r\n"); c.close(); diff --git a/test/simple/test-http-proxy.js b/test/simple/test-http-proxy.js index 20992b9dc6d..ebdf7af10f3 100644 --- a/test/simple/test-http-proxy.js +++ b/test/simple/test-http-proxy.js @@ -1,5 +1,5 @@ require("../common"); -http = require("http"); +http = require("http2"); url = require("url"); var PROXY_PORT = PORT; diff --git a/test/simple/test-http-server.js b/test/simple/test-http-server.js index fba33ba9fcb..e42d55429e9 100644 --- a/test/simple/test-http-server.js +++ b/test/simple/test-http-server.js @@ -1,6 +1,6 @@ require("../common"); -tcp = require("tcp"); -http = require("http"); +net = require("net"); +http = require("http2"); url = require("url"); qs = require("querystring"); @@ -43,7 +43,7 @@ http.createServer(function (req, res) { }).listen(PORT); -var c = tcp.createConnection(PORT); +var c = net.createConnection(PORT); c.setEncoding("utf8"); diff --git a/test/simple/test-http-wget.js b/test/simple/test-http-wget.js index 09bda325933..38a41896034 100644 --- a/test/simple/test-http-wget.js +++ b/test/simple/test-http-wget.js @@ -1,6 +1,6 @@ require("../common"); -tcp = require("tcp"); -http = require("http"); +net = require("net"); +http = require("http2"); // wget sends an HTTP/1.0 request with Connection: Keep-Alive // @@ -29,7 +29,7 @@ var server = http.createServer(function (req, res) { }) server.listen(PORT); -var c = tcp.createConnection(PORT); +var c = net.createConnection(PORT); c.setEncoding("utf8"); diff --git a/test/simple/test-http.js b/test/simple/test-http.js index c59927763ab..df0ebea4064 100644 --- a/test/simple/test-http.js +++ b/test/simple/test-http.js @@ -1,5 +1,5 @@ require("../common"); -http = require("http"); +http = require("http2"); url = require("url"); var responses_sent = 0; diff --git a/test/simple/test-remote-module-loading.js b/test/simple/test-remote-module-loading.js index 0a2af87e087..8a7edbbe27b 100644 --- a/test/simple/test-remote-module-loading.js +++ b/test/simple/test-remote-module-loading.js @@ -1,6 +1,6 @@ require("../common"); -var http = require('http'); +var http = require('http2'); var sys = require('sys'); var url = require("url"); var modulesLoaded = 0;