All tests to use http2

ry · ry · commit 33d5c46e8cc9 · 2010-03-18T14:01:17.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
