Update tests to work with module contexts

test/common.js

@@ -1,7 +1,5 @@
 var path = require("path");
 
-exports = module.exports = global;
-
 exports.testDir = path.dirname(__filename);
 exports.fixturesDir = path.join(exports.testDir, "fixtures");
 exports.libDir = path.join(exports.testDir, "../lib");

test/disabled/test-cat.js

@@ -13,12 +13,12 @@ var server = http.createServer(function (req, res) {
   res.sendBody(body);
   res.finish();
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 var errors = 0;
 var successes = 0;
 
-var promise = process.cat("http://localhost:"+PORT, "utf8");
+var promise = process.cat("http://localhost:"+common.PORT, "utf8");
 
 promise.addCallback(function (content) {
   assert.equal(body, content);

test/disabled/test-dns.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var dns = require("dns"),
     child_process = require("child_process"),

test/disabled/test-eio-race3.js

@@ -1,6 +1,7 @@
 /* XXX Can this test be modified to not call the now-removed wait()? */
 
-require("../common");
+common = require("../common");
+assert = common.assert
 
 
 console.log('first stat ...');

test/disabled/test-fs-sendfile.js

@@ -1,8 +1,9 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 tcp = require("tcp");
 sys = require("sys");
-var x = path.join(fixturesDir, "x.txt");
+var x = path.join(common.fixturesDir, "x.txt");
 var expected = "xyz";
 
 var server = tcp.createServer(function (socket) {
@@ -14,9 +15,9 @@ var server = tcp.createServer(function (socket) {
     assert.equal(expected, found);
   });
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
-var client = tcp.createConnection(PORT);
+var client = tcp.createConnection(common.PORT);
 client.addListener("connect", function () {
   fs.open(x, 'r').addCallback(function (fd) {
     fs.sendfile(client.fd, fd, 0, expected.length).addCallback(function (size) {

test/disabled/test-http-big-proxy-responses.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 var sys = require("sys"),
 fs = require("fs"),
 http = require("http"),
@@ -63,7 +64,7 @@ function call_chargen(list) {
   if (list.length > 0) {
     var len = list.shift();
 
-    sys.debug("calling chargen for " + len + " chunks.");
+    sys.common.debug("calling chargen for " + len + " chunks.");
 
     var recved = 0;
 
@@ -78,7 +79,7 @@ function call_chargen(list) {
 
       res.addListener('end', function() {
         assert.ok(recved <= (len*chunk.length));
-        sys.debug("end for " + len + " chunks.");
+        sys.common.debug("end for " + len + " chunks.");
         call_chargen(list);
       });
 

test/disabled/test-http-head-request.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var assert = require("assert");
 var http = require("http");
@@ -14,12 +15,12 @@ server = http.createServer(function (req, res) {
   if (req.method != 'HEAD') res.write(body);
   res.end();
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 var gotEnd = false;
 
 server.addListener('listening', function() {
-  var client = http.createClient(PORT);
+  var client = http.createClient(common.PORT);
   var request = client.request("HEAD", "/");
   request.addListener('response', function (response) {
     console.log('got response');

test/disabled/test-http-stress.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 http = require("http");
 
@@ -10,14 +11,14 @@ var server = http.createServer(function(req, res) {
  res.write(body);
  res.end();
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 var requests_ok = 0;
 var requests_complete = 0;
 
 server.addListener('listening', function () {
  for (var i = 0; i < request_count; i++) {
-   http.cat('http://localhost:'+PORT+'/', 'utf8', function (err, content) {
+   http.cat('http://localhost:'+common.PORT+'/', 'utf8', function (err, content) {
      requests_complete++;
      if (err) {
        print("-");

test/disabled/test-idle-watcher.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var complete = false;
 var idle = new process.IdleWatcher();

test/disabled/test-net-fd-passing.js

@@ -8,7 +8,7 @@ function fdPassingTest(path, port) {
   var message = "beep toot";
   var expectedData = ["[greeting] " + greeting, "[echo] " + message];
 
-  var receiverArgs = [fixturesDir + "/net-fd-passing-receiver.js", path, greeting];
+  var receiverArgs = [common.fixturesDir + "/net-fd-passing-receiver.js", path, greeting];
   var receiver = process.createChildProcess(process.ARGV[0], receiverArgs);
 
   var initializeSender = function() {

test/disabled/test-remote-module-loading.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var http = require('http');
 var sys = require('sys');
@@ -14,16 +15,16 @@ var server = http.createServer(function(req, res) {
   res.write(body);
   res.end();
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 assert.throws(function () {
-  var httpModule = require('http://localhost:'+PORT+'/moduleA.js');
+  var httpModule = require('http://localhost:'+common.PORT+'/moduleA.js');
   assert.equal('/moduleA.js', httpModule.httpPath());
   modulesLoaded++;
 });
 
 var nodeBinary = process.ARGV[0];
-var cmd = 'NODE_PATH='+libDir+' '+nodeBinary+' http://localhost:'+PORT+'/moduleB.js';
+var cmd = 'NODE_PATH='+libDir+' '+nodeBinary+' http://localhost:'+common.PORT+'/moduleB.js';
 
 sys.exec(cmd, function (err, stdout, stderr) {
   if (err) throw err;

test/disabled/test-setuidgid.js

@@ -1,5 +1,6 @@
 // Requires special privlages
-require('../common');
+common = require("../common");
+assert = common.assert
 var assert = require('assert');
 
 var oldgid = process.getgid();

test/disabled/tls_client.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 var sys=require('sys');
 var net=require('net');
 var fs=require('fs');
@@ -8,7 +9,7 @@ var crypto=require('crypto');
 var client = net.createConnection(443, "www.microsoft.com");
 //var client = net.createConnection(443, "www.google.com");
 
-var caPem = fs.readFileSync(fixturesDir+"/msca.pem");
+var caPem = fs.readFileSync(common.fixturesDir+"/msca.pem");
 //var caPem = fs.readFileSync("ca.pem");
 
 var credentials = crypto.createCredentials({ca:caPem});
@@ -27,7 +28,7 @@ client.addListener("secure", function () {
 });
 
 client.addListener("data", function (chunk) {
-  sys.error(chunk);
+  sys.common.error(chunk);
 });
 
 client.addListener("end", function () {

test/disabled/tls_server.js

@@ -1,12 +1,13 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var sys=require('sys');
 var net=require('net');
 var fs=require('fs');
 var crypto=require('crypto');
 
-var keyPem = fs.readFileSync(fixturesDir + "/cert.pem");
+var keyPem = fs.readFileSync(common.fixturesDir + "/cert.pem");
-var certPem = fs.readFileSync(fixturesDir + "/cert.pem");
+var certPem = fs.readFileSync(common.fixturesDir + "/cert.pem");
 
 var credentials = crypto.createCredentials({key:keyPem, cert:certPem});
 var i = 0;

test/fixtures/a.js

@@ -1,6 +1,6 @@
 var c = require("./b/c");
 
-debug("load fixtures/a.js");
+common.debug("load fixtures/a.js");
 
 var string = "A";
 

test/fixtures/echo.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 print("hello world\r\n");
 

test/fixtures/print-chars-from-buffer.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 Buffer = require("buffer").Buffer;
 
 var n = parseInt(process.argv[2]);

test/fixtures/print-chars.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var n = parseInt(process.argv[2]);
 

test/message/2100bytes.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 sys = require('sys');
 console.log([

test/message/hello_world.js

@@ -1,3 +1,4 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 console.log('hello world');

test/message/undefined_reference_in_new_context.js

@@ -1,6 +1,7 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
-error('before');
+common.error('before');
 
 var Script = process.binding('evals').Script;
 
@@ -8,4 +9,4 @@ var Script = process.binding('evals').Script;
 script = new Script('foo.bar = 5;');
 script.runInNewContext();
 
-error('after');
+common.error('after');

test/message/undefined_reference_in_new_context.out

@@ -1,7 +1,7 @@
 before
 
 
-*test/message/undefined_reference_in_new_context.js:9
+*test/message/undefined_reference_in_new_context.js:10
 script.runInNewContext();
        ^
 ReferenceError: foo is not defined
@@ -11,4 +11,4 @@ ReferenceError: foo is not defined
     at Module._loadScriptSync (module:*)
     at Module.loadSync (module:*)
     at Object.runMain (module:*)
-    at node.js:*242:10
+    at node.js:*

test/pummel/test-child-process-spawn-loop.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var spawn = require('child_process').spawn;
 

test/pummel/test-http-client-reconnect-bug.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var tcp = require("tcp"),
     sys = require("sys"),
@@ -10,9 +11,9 @@ var eofCount = 0;
 var server = tcp.createServer(function(socket) {
   socket.end();
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
-var client = http.createClient(PORT);
+var client = http.createClient(common.PORT);
 
 client.addListener("error", function() {
   console.log("ERROR!");

test/pummel/test-keep-alive.js

@@ -1,5 +1,6 @@
 // This test requires the program "ab"
-require("../common");
+common = require("../common");
+assert = common.assert
 http = require("http");
 exec = require("child_process").exec;
 
@@ -18,7 +19,7 @@ var normalReqSec = 0;
 
 
 function runAb(opts, callback) {
-  var command = "ab " + opts + " http://127.0.0.1:" + PORT + "/";
+  var command = "ab " + opts + " http://127.0.0.1:" + common.PORT + "/";
   exec(command, function (err, stdout, stderr) {
     if (err) {
       console.log("ab not installed? skipping test.\n" + stderr);
@@ -41,7 +42,7 @@ function runAb(opts, callback) {
   });
 }
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
   runAb("-k -c 100 -t 2", function (reqSec, keepAliveRequests) {
     keepAliveReqSec = reqSec;
     assert.equal(true, keepAliveRequests > 0);

test/pummel/test-net-many-clients.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 // settings
 var bytes = 1024*40;
@@ -23,7 +24,7 @@ var server = net.createServer(function (c) {
 });
 
 function runClient (callback) {
-  var client = net.createConnection(PORT);
+  var client = net.createConnection(common.PORT);
 
   client.connections = 0;
 
@@ -59,14 +60,14 @@ function runClient (callback) {
     assert.ok(!client.fd);
 
     if (this.connections < connections_per_client) {
-      this.connect(PORT);
+      this.connect(common.PORT);
     } else {
       callback();
     }
   });
 }
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
   var finished_clients = 0;
   for (var i = 0; i < concurrency; i++) {
     runClient(function () {

test/pummel/test-net-pause.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 N = 200;
 
@@ -15,13 +16,13 @@ server = net.createServer(function (connection) {
   }
   write(0);
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 
 recv = "";
 chars_recved = 0;
 
-client = net.createConnection(PORT);
+client = net.createConnection(common.PORT);
 client.setEncoding("ascii");
 client.addListener("data", function (d) {
     print(d);
@@ -63,5 +64,5 @@ client.addListener("end", function () {
 
 process.addListener("exit", function () {
   assert.equal(N, recv.length);
-  debug("Exit");
+  common.debug("Exit");
 });

test/pummel/test-net-pingpong-delay.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 
 
@@ -25,7 +26,7 @@ function pingPongTest (port, host, on_complete) {
     });
 
     socket.addListener("timeout", function () {
-      debug("server-side timeout!!");
+      common.debug("server-side timeout!!");
       assert.equal(false, true);
     });
 
@@ -71,7 +72,7 @@ function pingPongTest (port, host, on_complete) {
   });
 
   client.addListener("timeout", function () {
-    debug("client-side timeout!!");
+    common.debug("client-side timeout!!");
     assert.equal(false, true);
   });
 
@@ -84,7 +85,7 @@ function pingPongTest (port, host, on_complete) {
   });
 }
 
-pingPongTest(PORT);
+pingPongTest(common.PORT);
 
 process.addListener("exit", function () {
   assert.equal(1, tests_run);

test/pummel/test-net-pingpong.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 
 var tests_run = 0;
@@ -84,12 +85,12 @@ function pingPongTest (port, host, on_complete) {
 }
 
 /* All are run at once, so run on different ports */
-pingPongTest(PORT, "localhost");
+pingPongTest(common.PORT, "localhost");
-pingPongTest(PORT+1, null);
+pingPongTest(common.PORT+1, null);
 
 // This IPv6 isn't working on Solaris
 var solaris = /sunos/i.test(process.platform);
-if (!solaris) pingPongTest(PORT+2, "::1");
+if (!solaris) pingPongTest(common.PORT+2, "::1");
 
 process.addListener("exit", function () {
   assert.equal(solaris ? 2 : 3, tests_run);

test/pummel/test-net-throttle.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 N = 160*1024; // 30kb
 
@@ -8,7 +9,7 @@ for (var i = 0; i < N; i++) {
   body += "C";
 }
 
-console.log("start server on port " + PORT);
+console.log("start server on port " + common.PORT);
 
 server = net.createServer(function (connection) {
   connection.addListener("connect", function () {
@@ -16,7 +17,7 @@ server = net.createServer(function (connection) {
     connection.end();
   });
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 
 chars_recved = 0;
@@ -24,7 +25,7 @@ npauses = 0;
 
 
 var paused = false;
-client = net.createConnection(PORT);
+client = net.createConnection(common.PORT);
 client.setEncoding("ascii");
 client.addListener("data", function (d) {
   chars_recved += d.length;

test/pummel/test-net-timeout.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 exchanges = 0;
 starttime = null;
@@ -29,11 +30,11 @@ var echo_server = net.createServer(function (socket) {
   });
 });
 
-echo_server.listen(PORT, function () {
+echo_server.listen(common.PORT, function () {
-  console.log("server listening at " + PORT);
+  console.log("server listening at " + common.PORT);
 });
 
-var client = net.createConnection(PORT);
+var client = net.createConnection(common.PORT);
 client.setEncoding("UTF8");
 client.setTimeout(0); // disable the timeout for client
 client.addListener("connect", function () {

test/pummel/test-net-tls.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 tcp = require("tcp");
 fs=require("fs");
 
@@ -105,13 +106,13 @@ try {
 }
 
 if (have_tls) {
-  var caPem = fs.readFileSync(fixturesDir+"/test_ca.pem");
+  var caPem = fs.readFileSync(common.fixturesDir+"/test_ca.pem");
-  var certPem = fs.readFileSync(fixturesDir+"/test_cert.pem");
+  var certPem = fs.readFileSync(common.fixturesDir+"/test_cert.pem");
-  var keyPem = fs.readFileSync(fixturesDir+"/test_key.pem");
+  var keyPem = fs.readFileSync(common.fixturesDir+"/test_key.pem");
 
   /* All are run at once, so run on different ports */
-  tlsTest(PORT, "localhost", caPem, keyPem, certPem);
+  tlsTest(common.PORT, "localhost", caPem, keyPem, certPem);
-  tlsTest(PORT+1, null, caPem, keyPem, certPem);
+  tlsTest(common.PORT+1, null, caPem, keyPem, certPem);
 
   process.addListener("exit", function () {
     assert.equal(2, tests_run);

test/pummel/test-timers.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 assert = require('assert');
 

test/pummel/test-watch-file.js

@@ -1,10 +1,11 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var fs = require("fs");
 var path = require("path");
 
-var f = path.join(fixturesDir, "x.txt");
+var f = path.join(common.fixturesDir, "x.txt");
-var f2 = path.join(fixturesDir, "x2.txt");
+var f2 = path.join(common.fixturesDir, "x2.txt");
 
 console.log("watching for changes of " + f);
 

test/simple/test-assert.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var a = require('assert');
 

test/simple/test-buffer.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 assert = require("assert");
 
 var Buffer = require('buffer').Buffer;

test/simple/test-byte-length.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 assert.equal(14, process._byteLength("Il était tué"));
 assert.equal(14, process._byteLength("Il était tué", "utf8"));

test/simple/test-c-ares.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var dns = require("dns");
 

test/simple/test-chdir.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 assert.equal(true, process.cwd() !== __dirname);
 

test/simple/test-child-process-buffering.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var spawn = require('child_process').spawn;
 

test/simple/test-child-process-custom-fds.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var assert = require('assert');
 var spawn  = require('child_process').spawn;
@@ -7,7 +8,7 @@ var fs     = require('fs');
 var sys    = require('sys');
 
 function fixtPath(p) {
-  return path.join(fixturesDir, p);
+  return path.join(common.fixturesDir, p);
 }
 
 var expected = "hello world";

test/simple/test-child-process-env.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var spawn = require('child_process').spawn;
 child = spawn('/usr/bin/env', [], {'HELLO' : 'WORLD'});

test/simple/test-child-process-exit-code.js

@@ -1,10 +1,11 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 spawn = require('child_process').spawn,
 path = require('path');
 
 exits = 0;
 
-exitScript = path.join(fixturesDir, 'exit.js')
+exitScript = path.join(common.fixturesDir, 'exit.js')
 exitChild = spawn(process.argv[0], [exitScript, 23]);
 exitChild.addListener('exit', function(code, signal) {
   assert.strictEqual(code, 23);
@@ -15,7 +16,7 @@ exitChild.addListener('exit', function(code, signal) {
 
 
 
-errorScript = path.join(fixturesDir, 'child_process_should_emit_error.js')
+errorScript = path.join(common.fixturesDir, 'child_process_should_emit_error.js')
 errorChild = spawn(process.argv[0], [errorScript]);
 errorChild.addListener('exit', function(code, signal) {
   assert.ok(code !== 0);

test/simple/test-child-process-ipc.js

@@ -1,10 +1,11 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var spawn = require('child_process').spawn;
 
 var path = require('path');
 
-var sub = path.join(fixturesDir, 'echo.js');
+var sub = path.join(common.fixturesDir, 'echo.js');
 
 var gotHelloWorld = false;
 var gotEcho = false;

test/simple/test-child-process-kill.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var spawn = require('child_process').spawn;
 

test/simple/test-child-process-stdin.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var spawn = require('child_process').spawn;
 

test/simple/test-child-process-stdout-flush.js

@@ -1,7 +1,8 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var path = require('path');
 var spawn = require('child_process').spawn;
-var sub = path.join(fixturesDir, 'print-chars.js');
+var sub = path.join(common.fixturesDir, 'print-chars.js');
 
 n = 500000;
 

test/simple/test-crypto.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 try {
   var crypto = require('crypto');
@@ -11,9 +12,9 @@ var fs = require('fs');
 var sys = require('sys');
 
 // Test Certificates
-var caPem = fs.readFileSync(fixturesDir+"/test_ca.pem", 'ascii');
+var caPem = fs.readFileSync(common.fixturesDir+"/test_ca.pem", 'ascii');
-var certPem = fs.readFileSync(fixturesDir+"/test_cert.pem", 'ascii');
+var certPem = fs.readFileSync(common.fixturesDir+"/test_cert.pem", 'ascii');
-var keyPem = fs.readFileSync(fixturesDir+"/test_key.pem", 'ascii');
+var keyPem = fs.readFileSync(common.fixturesDir+"/test_key.pem", 'ascii');
 
 var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
 

test/simple/test-delayed-require.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 setTimeout(function () {
   a = require("../fixtures/a");

test/simple/test-dgram-pingpong.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var Buffer = require('buffer').Buffer;
 var dgram = require("dgram");
 

test/simple/test-dgram-udp4.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var Buffer = require("buffer").Buffer,
     fs = require("fs"),

test/simple/test-dgram-unix-anon.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var Buffer = require("buffer").Buffer,
     fs = require("fs"),

test/simple/test-dgram-unix.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var Buffer = require("buffer").Buffer,
     fs = require("fs"),

test/simple/test-eio-race.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var count = 100;
 var fs = require('fs');

test/simple/test-eio-race2.js

@@ -1,6 +1,7 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var path = require('path');
-var testTxt = path.join(fixturesDir, "x.txt");
+var testTxt = path.join(common.fixturesDir, "x.txt");
 var fs = require('fs');
 
 setTimeout(function () {

test/simple/test-eio-race4.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var fs = require('fs');
 var N = 100;
 var j = 0;

test/simple/test-error-reporting.js

@@ -1,11 +1,12 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 exec = require('child_process').exec,
 path = require('path');
 
 exits = 0;
 
 function errExec (script, callback) {
-  var cmd = process.argv[0] + ' ' + path.join(fixturesDir, script);
+  var cmd = process.argv[0] + ' ' + path.join(common.fixturesDir, script);
   return exec(cmd, function (err, stdout, stderr) {
     // There was some error
     assert.ok(err);

test/simple/test-eval-cx.js

@@ -1,10 +1,11 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
-debug('evalcx a string');
+common.debug('evalcx a string');
 var result = process.evalcx('"passed";');
 assert.equal('passed', result);
 
-debug('evalcx a thrown error');
+common.debug('evalcx a thrown error');
 assert.throws(function() {
   process.evalcx('throw new Error("test");');
 });
@@ -14,7 +15,7 @@ process.evalcx('hello = 2');
 assert.equal(5, hello);
 
 
-debug("pass values in and out");
+common.debug("pass values in and out");
 code = "foo = 1;"
      + "bar = 2;"
      + "if (baz !== 3) throw new Error('test fail');";
@@ -25,12 +26,12 @@ assert.equal(1, obj.foo);
 assert.equal(2, obj.bar);
 assert.equal(2, foo);
 
-debug("call a function by reference");
+common.debug("call a function by reference");
 function changeFoo () { foo = 100 }
 process.evalcx("f()", { f : changeFoo });
 assert.equal(foo, 100);
 
-debug("modify an object by reference");
+common.debug("modify an object by reference");
 var f = { a : 1 };
 process.evalcx("f.a = 2", { f : f });
 assert.equal(f.a, 2);

test/simple/test-event-emitter-add-listeners.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var events = require('events');
 
 var e = new events.EventEmitter();

test/simple/test-event-emitter-modify-in-emit.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var events = require('events');
 
 var callbacks_called = [ ];

test/simple/test-event-emitter-remove-listeners.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var events = require('events');
 
 

test/simple/test-exception-handler.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var MESSAGE = 'catch me if you can';
 var caughtException = false;

test/simple/test-exec.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var exec = require('child_process').exec;
 success_count = 0;
 error_count = 0;

test/simple/test-executable-path.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 path = require("path");
 

test/simple/test-file-read-noexist.js

@@ -1,15 +1,16 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var path = require('path');
 var fs = require('fs');
 var got_error = false;
 
-var filename = path.join(fixturesDir, "does_not_exist.txt");
+var filename = path.join(common.fixturesDir, "does_not_exist.txt");
 fs.readFile(filename, "raw", function (err, content) {
   if (err) {
     got_error = true;
   } else {
-    debug("cat returned some content: " + content);
+    common.debug("cat returned some content: " + content);
-    debug("this shouldn't happen as the file doesn't exist...");
+    common.debug("this shouldn't happen as the file doesn't exist...");
     assert.equal(true, false);
   }
 });

test/simple/test-file-write-stream.js

@@ -1,9 +1,10 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var
   path = require('path'),
   fs = require('fs'),
-  fn = path.join(fixturesDir, "write.txt"),
+  fn = path.join(common.fixturesDir, "write.txt"),
   file = fs.createWriteStream(fn),
 
   EXPECTED = '012345678910',

test/simple/test-fs-chmod.js

@@ -1,10 +1,11 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var path = require('path');
 var fs = require('fs');
 var got_error = false;
 var success_count = 0;
 
-var file = path.join(fixturesDir, "a.js");
+var file = path.join(common.fixturesDir, "a.js");
 
 fs.chmod(file, 0777, function (err) {
   if (err) {

test/simple/test-fs-error-messages.js

@@ -1,9 +1,10 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var path = require('path'),
     fs = require('fs'),
-    fn = path.join(fixturesDir, 'non-existent'),
+    fn = path.join(common.fixturesDir, 'non-existent'),
-    existingFile = path.join(fixturesDir, 'exit.js');
+    existingFile = path.join(common.fixturesDir, 'exit.js');
 
 // ASYNC_CALL
 

test/simple/test-fs-fsync.js

@@ -1,32 +1,33 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 var path = require('path');
 var fs = require('fs');
 var successes = 0;
 
-var file = path.join(fixturesDir, "a.js");
+var file = path.join(common.fixturesDir, "a.js");
 
-error("open " + file);
+common.error("open " + file);
 
 fs.open(file, "a", 0777, function (err, fd) {
-  error("fd " + fd);
+  common.error("fd " + fd);
   if (err) throw err;
 
   fs.fdatasyncSync(fd);
-  error("fdatasync SYNC: ok");
+  common.error("fdatasync SYNC: ok");
   successes++;
 
   fs.fsyncSync(fd);
-  error("fsync SYNC: ok");
+  common.error("fsync SYNC: ok");
   successes++;
 
   fs.fdatasync(fd, function (err) {
     if (err) throw err;
-    error("fdatasync ASYNC: ok");
+    common.error("fdatasync ASYNC: ok");
     successes++;
     fs.fsync(fd, function(err) {
       if (err) throw err;
-      error("fsync ASYNC: ok");
+      common.error("fsync ASYNC: ok");
       successes++;
     });
   });

test/simple/test-fs-read-buffer.js

@@ -1,8 +1,9 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 var path = require('path'),
     Buffer = require('buffer').Buffer,
     fs = require('fs'),
-    filepath = path.join(fixturesDir, 'x.txt'),
+    filepath = path.join(common.fixturesDir, 'x.txt'),
     fd = fs.openSync(filepath, 'r'),
     expected = 'xyz\n',
     bufferAsync = new Buffer(expected.length),

test/simple/test-fs-read-file-sync.js

@@ -1,8 +1,9 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 path = require('path');
 fs = require('fs');
-fn = path.join(fixturesDir, 'elipses.txt');
+fn = path.join(common.fixturesDir, 'elipses.txt');
 
 var s = fs.readFileSync(fn, 'utf8');
 for (var i = 0; i < s.length; i++) {

test/simple/test-fs-read-stream.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 // TODO Improved this test. test_ca.pem is too small. A proper test would
 // great a large utf8 (with multibyte chars) file and stream it in,
@@ -7,7 +8,7 @@ require('../common');
 Buffer = require('buffer').Buffer;
 path = require('path');
 fs = require('fs');
-fn = path.join(fixturesDir, 'elipses.txt');
+fn = path.join(common.fixturesDir, 'elipses.txt');
 
 callbacks = { open: 0, end: 0, close: 0, destroy: 0 };
 

test/simple/test-fs-read.js

@@ -1,7 +1,8 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 var path = require('path'),
     fs = require('fs'),
-    filepath = path.join(fixturesDir, 'x.txt'),
+    filepath = path.join(common.fixturesDir, 'x.txt'),
     fd = fs.openSync(filepath, 'r'),
     expected = 'xyz\n',
     readCalled = 0;

test/simple/test-fs-readfile-empty.js

@@ -1,9 +1,10 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var
   path = require('path'),
   fs = require('fs'),
-  fn = path.join(fixturesDir, 'empty.txt');
+  fn = path.join(common.fixturesDir, 'empty.txt');
 
 fs.readFile(fn, function(err, data) {
   assert.ok(data);

test/simple/test-fs-realpath.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var fs = require('fs');
 var path = require('path');
 var async_completed = 0, async_expected = 0, unlink = [];
@@ -30,8 +31,8 @@ function bashRealpath(path, callback) {
 // sub-tests:
 
 function test_simple_relative_symlink(callback) {
-  var entry = fixturesDir+'/cycles/symlink',
+  var entry = common.fixturesDir+'/cycles/symlink',
-      expected = fixturesDir+'/cycles/root.js';
+      expected = common.fixturesDir+'/cycles/root.js';
   [
     [entry, 'root.js'],
   ].forEach(function(t) {
@@ -41,15 +42,15 @@ function test_simple_relative_symlink(callback) {
   });
   var result = fs.realpathSync(entry);
   assert.equal(result, expected,
-      'got '+inspect(result)+' expected '+inspect(expected));
+      'got '+common.inspect(result)+' expected '+common.inspect(expected));
   asynctest(fs.realpath, [entry], callback, function(err, result){
     assert.equal(result, expected,
-      'got '+inspect(result)+' expected '+inspect(expected));
+      'got '+common.inspect(result)+' expected '+common.inspect(expected));
   });
 }
 
 function test_simple_absolute_symlink(callback) {
-  bashRealpath(fixturesDir, function(err, fixturesAbsDir) {
+  bashRealpath(common.fixturesDir, function(err, fixturesAbsDir) {
     if (err) return callback(err);
     var entry = fixturesAbsDir+'/cycles/symlink',
         expected = fixturesAbsDir+'/nested-index/one/index.js';
@@ -62,23 +63,23 @@ function test_simple_absolute_symlink(callback) {
     });
     var result = fs.realpathSync(entry);
     assert.equal(result, expected,
-        'got '+inspect(result)+' expected '+inspect(expected));
+        'got '+common.inspect(result)+' expected '+common.inspect(expected));
     asynctest(fs.realpath, [entry], callback, function(err, result){
       assert.equal(result, expected,
-        'got '+inspect(result)+' expected '+inspect(expected));
+        'got '+common.inspect(result)+' expected '+common.inspect(expected));
     });
   });
 }
 
 function test_deep_relative_file_symlink(callback) {
-  var expected = path.join(fixturesDir, 'cycles', 'root.js');
+  var expected = path.join(common.fixturesDir, 'cycles', 'root.js');
   var linkData1 = "../../cycles/root.js";
-  var linkPath1 = path.join(fixturesDir, "nested-index", 'one', 'symlink1.js');
+  var linkPath1 = path.join(common.fixturesDir, "nested-index", 'one', 'symlink1.js');
   try {fs.unlinkSync(linkPath1);}catch(e){}
   fs.symlinkSync(linkData1, linkPath1);
 
   var linkData2 = "../one/symlink1.js";
-  var entry = path.join(fixturesDir, "nested-index", 'two', 'symlink1-b.js');
+  var entry = path.join(common.fixturesDir, "nested-index", 'two', 'symlink1-b.js');
   try {fs.unlinkSync(entry);}catch(e){}
   fs.symlinkSync(linkData2, entry);
   unlink.push(linkPath1);
@@ -87,19 +88,19 @@ function test_deep_relative_file_symlink(callback) {
   assert.equal(fs.realpathSync(entry), expected);
   asynctest(fs.realpath, [entry], callback, function(err, result){
     assert.equal(result, expected,
-      'got '+inspect(result)+' expected '+inspect(expected));
+      'got '+common.inspect(result)+' expected '+common.inspect(expected));
   });
 }
 
 function test_deep_relative_dir_symlink(callback) {
-  var expected = path.join(fixturesDir, 'cycles', 'folder');
+  var expected = path.join(common.fixturesDir, 'cycles', 'folder');
   var linkData1b = "../../cycles/folder";
-  var linkPath1b = path.join(fixturesDir, "nested-index", 'one', 'symlink1-dir');
+  var linkPath1b = path.join(common.fixturesDir, "nested-index", 'one', 'symlink1-dir');
   try {fs.unlinkSync(linkPath1b);}catch(e){}
   fs.symlinkSync(linkData1b, linkPath1b);
 
   var linkData2b = "../one/symlink1-dir";
-  var entry = path.join(fixturesDir, "nested-index", 'two', 'symlink12-dir');
+  var entry = path.join(common.fixturesDir, "nested-index", 'two', 'symlink12-dir');
   try {fs.unlinkSync(entry);}catch(e){}
   fs.symlinkSync(linkData2b, entry);
   unlink.push(linkPath1b);
@@ -109,16 +110,16 @@ function test_deep_relative_dir_symlink(callback) {
 
   asynctest(fs.realpath, [entry], callback, function(err, result){
     assert.equal(result, expected,
-      'got '+inspect(result)+' expected '+inspect(expected));
+      'got '+common.inspect(result)+' expected '+common.inspect(expected));
   });
 }
 
 function test_cyclic_link_protection(callback) {
-  var entry = fixturesDir+'/cycles/realpath-3a';
+  var entry = common.fixturesDir+'/cycles/realpath-3a';
   [
     [entry, '../cycles/realpath-3b'],
-    [fixturesDir+'/cycles/realpath-3b', '../cycles/realpath-3c'],
+    [common.fixturesDir+'/cycles/realpath-3b', '../cycles/realpath-3c'],
-    [fixturesDir+'/cycles/realpath-3c', '../cycles/realpath-3a'],
+    [common.fixturesDir+'/cycles/realpath-3c', '../cycles/realpath-3a'],
   ].forEach(function(t) {
     try {fs.unlinkSync(t[0]);}catch(e){}
     fs.symlinkSync(t[1], t[0]);
@@ -132,14 +133,14 @@ function test_cyclic_link_protection(callback) {
 }
 
 function test_relative_input_cwd(callback) {
-  var p = fixturesDir.lastIndexOf('/');
+  var p = common.fixturesDir.lastIndexOf('/');
-  var entrydir = fixturesDir.substr(0, p);
+  var entrydir = common.fixturesDir.substr(0, p);
-  var entry = fixturesDir.substr(p+1)+'/cycles/realpath-3a';
+  var entry = common.fixturesDir.substr(p+1)+'/cycles/realpath-3a';
-  var expected = fixturesDir+'/cycles/root.js';
+  var expected = common.fixturesDir+'/cycles/root.js';
   [
     [entry, '../cycles/realpath-3b'],
-    [fixturesDir+'/cycles/realpath-3b', '../cycles/realpath-3c'],
+    [common.fixturesDir+'/cycles/realpath-3b', '../cycles/realpath-3c'],
-    [fixturesDir+'/cycles/realpath-3c', 'root.js'],
+    [common.fixturesDir+'/cycles/realpath-3c', 'root.js'],
   ].forEach(function(t) {
     var fn = t[0];
     if (fn.charAt(0) !== '/') fn = entrydir + '/' + fn;
@@ -153,16 +154,16 @@ function test_relative_input_cwd(callback) {
   asynctest(fs.realpath, [entry], callback, function(err, result){
     process.chdir(origcwd);
     assert.equal(result, expected,
-      'got '+inspect(result)+' expected '+inspect(expected));
+      'got '+common.inspect(result)+' expected '+common.inspect(expected));
     return true;
   });
 }
 
 function test_deep_symlink_mix(callback) {
-  // todo: check to see that fixturesDir is not rooted in the
+  // todo: check to see that common.fixturesDir is not rooted in the
   //       same directory as our test symlink.
   // obtain our current realpath using bash (so we can test ourselves)
-  bashRealpath(fixturesDir, function(err, fixturesAbsDir) {
+  bashRealpath(common.fixturesDir, function(err, fixturesAbsDir) {
     if (err) return callback(err);
     /*
     /tmp/node-test-realpath-f1 -> ../tmp/node-test-realpath-d1/foo
@@ -188,7 +189,7 @@ function test_deep_symlink_mix(callback) {
         [fixturesAbsDir+'/nested-index/one/realpath-c', fixturesAbsDir+'/nested-index/two/realpath-c'],
         [fixturesAbsDir+'/nested-index/two/realpath-c', '../../cycles/root.js'],
       ].forEach(function(t) {
-        //debug('setting up '+t[0]+' -> '+t[1]);
+        //common.debug('setting up '+t[0]+' -> '+t[1]);
         try {fs.unlinkSync(t[0]);}catch(e){}
         fs.symlinkSync(t[1], t[0]);
         unlink.push(t[0]);
@@ -200,14 +201,14 @@ function test_deep_symlink_mix(callback) {
     assert.equal(fs.realpathSync(entry), expected);
     asynctest(fs.realpath, [entry], callback, function(err, result){
       assert.equal(result, expected,
-        'got '+inspect(result)+' expected '+inspect(expected));
+        'got '+common.inspect(result)+' expected '+common.inspect(expected));
       return true;
     });
   });
 }
 
 function test_non_symlinks(callback) {
-  bashRealpath(fixturesDir, function(err, fixturesAbsDir) {
+  bashRealpath(common.fixturesDir, function(err, fixturesAbsDir) {
     if (err) return callback(err);
     var p = fixturesAbsDir.lastIndexOf('/');
     var entrydir = fixturesAbsDir.substr(0, p);
@@ -219,7 +220,7 @@ function test_non_symlinks(callback) {
     asynctest(fs.realpath, [entry], callback, function(err, result){
       process.chdir(origcwd);
       assert.equal(result, expected,
-        'got '+inspect(result)+' expected '+inspect(expected));
+        'got '+common.inspect(result)+' expected '+common.inspect(expected));
       return true;
     });
   });

test/simple/test-fs-stat.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var fs = require('fs');
 var got_error = false;
 var success_count = 0;

test/simple/test-fs-symlink.js

@@ -1,11 +1,12 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var path = require('path');
 var fs = require('fs');
 var completed = 0;
 
 // test creating and reading symbolic link
 var linkData = "../../cycles/root.js";
-var linkPath = path.join(fixturesDir, "nested-index", 'one', 'symlink1.js');
+var linkPath = path.join(common.fixturesDir, "nested-index", 'one', 'symlink1.js');
 try {fs.unlinkSync(linkPath);}catch(e){}
 fs.symlink(linkData, linkPath, function(err){
   if (err) throw err;
@@ -19,8 +20,8 @@ fs.symlink(linkData, linkPath, function(err){
 });
 
 // test creating and reading hard link
-var srcPath = path.join(fixturesDir, "cycles", 'root.js');
+var srcPath = path.join(common.fixturesDir, "cycles", 'root.js');
-var dstPath = path.join(fixturesDir, "nested-index", 'one', 'link1.js');
+var dstPath = path.join(common.fixturesDir, "nested-index", 'one', 'link1.js');
 try {fs.unlinkSync(dstPath);}catch(e){}
 fs.link(srcPath, dstPath, function(err){
   if (err) throw err;

test/simple/test-fs-write-buffer.js

@@ -1,8 +1,9 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 var path = require('path'),
     Buffer = require('buffer').Buffer,
     fs = require('fs'),
-    filename = path.join(fixturesDir, 'write.txt'),
+    filename = path.join(common.fixturesDir, 'write.txt'),
     expected = new Buffer('hello'),
     openCalled = 0,
     writeCalled = 0;

test/simple/test-fs-write-file.js

@@ -1,12 +1,13 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 join = require('path').join;
 fs = require('fs');
 Buffer = require('buffer').Buffer;
 
-filename = join(fixturesDir, 'test.txt');
+filename = join(common.fixturesDir, 'test.txt');
 
-error('writing to ' + filename);
+common.error('writing to ' + filename);
 
 s = "南越国是前203年至前111年存在于岭南地区的一个国家，国都位于番禺，疆域包括今天中国的广东、广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。南越国是秦朝灭亡后，由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。前196年和前179年，南越国曾先后两次名义上臣属于西汉，成为西汉的“外臣”。前112年，南越国末代君主赵建德与西汉发生战争，被汉武帝于前111年所灭。南越国共存在93年，历经五代君主。南越国是岭南地区的第一个有记载的政权国家，采用封建制和郡县制并存的制度，它的建立保证了秦末乱世岭南地区社会秩序的稳定，有效的改善了岭南地区落后的政治、##济现状。\n";
 
@@ -16,30 +17,30 @@ fs.writeFile(filename, s, function (e) {
   if (e) throw e;
 
   ncallbacks++;
-  error('file written');
+  common.error('file written');
 
   fs.readFile(filename, function (e, buffer) {
     if (e) throw e;
-    error('file read');
+    common.error('file read');
     ncallbacks++;
     assert.equal(Buffer.byteLength(s), buffer.length);
   });
 });
 
 // test that writeFile accepts buffers
-filename2 = join(fixturesDir, 'test2.txt');
+filename2 = join(common.fixturesDir, 'test2.txt');
 buf = new Buffer(s, 'utf8');
-error('writing to ' + filename2);
+common.error('writing to ' + filename2);
 
 fs.writeFile(filename2, buf, function (e) {
   if (e) throw e;
 
   ncallbacks++;
-  error('file2 written');
+  common.error('file2 written');
 
   fs.readFile(filename2, function (e, buffer) {
     if (e) throw e;
-    error('file2 read');
+    common.error('file2 read');
     ncallbacks++;
     assert.equal(buf.length, buffer.length);
   });
@@ -47,7 +48,7 @@ fs.writeFile(filename2, buf, function (e) {
 
 
 process.addListener('exit', function () {
-  error('done');
+  common.error('done');
   assert.equal(4, ncallbacks);
 
   fs.unlinkSync(filename);

test/simple/test-fs-write-sync.js

@@ -1,8 +1,9 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 path = require('path'),
 Buffer = require('buffer').Buffer
 fs = require('fs')
-fn = path.join(fixturesDir, 'write.txt');
+fn = path.join(common.fixturesDir, 'write.txt');
 
 
 foo = 'foo'

test/simple/test-fs-write.js

@@ -1,8 +1,9 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var path = require('path');
 var Buffer = require('buffer').Buffer;
 var fs = require('fs');
-var fn = path.join(fixturesDir, "write.txt");
+var fn = path.join(common.fixturesDir, "write.txt");
 var expected = "ümlaut.";
 var found;
 

test/simple/test-http-1.0.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 http = require("http");
 
@@ -13,9 +14,9 @@ var server = http.createServer(function (req, res) {
   res.writeHead(200, {"Content-Type": "text/plain"});
   res.end(body);
 })
-server.listen(PORT);
+server.listen(common.PORT);
 
-var c = net.createConnection(PORT);
+var c = net.createConnection(common.PORT);
 
 c.setEncoding("utf8");
 

test/simple/test-http-304.js

@@ -1,21 +1,21 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
-var sys = require('sys'),
+http = require('http');
-  http = require('http'),
+childProcess = require('child_process');
-  childProcess = require('child_process');
 
 s = http.createServer(function (request, response) {
   response.writeHead(304);
   response.end();
 });
 
-s.listen(PORT, function () {
+s.listen(common.PORT, function () {
-  childProcess.exec('curl -i http://127.0.0.1:'+PORT+'/', function (err, stdout, stderr) {
+  childProcess.exec('curl -i http://127.0.0.1:'+common.PORT+'/', function (err, stdout, stderr) {
     if (err) throw err;
     s.close();
-    error('curled response correctly');
+    common.error('curled response correctly');
-    error(sys.inspect(stdout));
+    common.error(common.inspect(stdout));
   });
 });
 
-console.log('Server running at http://127.0.0.1:'+PORT+'/')
+console.log('Server running at http://127.0.0.1:'+common.PORT+'/')

test/simple/test-http-blank-header.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 http = require('http');
 net = require('net');
@@ -6,7 +7,7 @@ net = require('net');
 gotReq = false;
 
 server = http.createServer(function (req, res) {
-  error('got req');
+  common.error('got req');
   gotReq = true;
   assert.equal('GET', req.method);
   assert.equal('/blah', req.url);
@@ -18,11 +19,11 @@ server = http.createServer(function (req, res) {
 });
 
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
-  var c = net.createConnection(PORT);
+  var c = net.createConnection(common.PORT);
 
   c.addListener('connect', function () {
-    error('client wrote message');
+    common.error('client wrote message');
     c.write( "GET /blah HTTP/1.1\r\n"
            + "Host: mapdevel.trolologames.ru:443\r\n"
            + "Cookie:\r\n"
@@ -36,7 +37,7 @@ server.listen(PORT, function () {
   });
 
   c.addListener('close', function () {
-    error('client close');
+    common.error('client close');
     server.close();
   });
 });

test/simple/test-http-cat.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 http = require("http");
 
 var body = "exports.A = function() { return 'A';}";
@@ -14,8 +15,8 @@ var server = http.createServer(function (req, res) {
 var got_good_server_content = false;
 var bad_server_got_error = false;
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
-  http.cat("http://localhost:"+PORT+"/", "utf8", function (err, content) {
+  http.cat("http://localhost:"+common.PORT+"/", "utf8", function (err, content) {
     if (err) {
       throw err;
     } else {

test/simple/test-http-chunked.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var http = require("http");
 
 var UTF8_STRING = "南越国是前203年至前111年存在于岭南地区的一个国家，国都位于番禺，疆域包括今天中国的广东、广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。南越国是秦朝灭亡后，由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。前196年和前179年，南越国曾先后两次名义上臣属于西汉，成为西汉的“外臣”。前112年，南越国末代君主赵建德与西汉发生战争，被汉武帝于前111年所灭。南越国共存在93年，历经五代君主。南越国是岭南地区的第一个有记载的政权国家，采用封建制和郡县制并存的制度，它的建立保证了秦末乱世岭南地区社会秩序的稳定，有效的改善了岭南地区落后的政治、经济现状。";
@@ -7,9 +8,9 @@ var server = http.createServer(function(req, res) {
   res.writeHead(200, {"Content-Type": "text/plain; charset=utf8"});
   res.end(UTF8_STRING, 'utf8');
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
-http.cat("http://127.0.0.1:"+PORT+"/", "utf8", function (err, data) {
+http.cat("http://127.0.0.1:"+common.PORT+"/", "utf8", function (err, data) {
   if (err) throw err;
   assert.equal('string', typeof data);
   console.log('here is the response:');

test/simple/test-http-client-race-2.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 http = require("http");
 url = require("url");
 
@@ -26,9 +27,9 @@ var server = http.createServer(function (req, res) {
                       });
   res.end(body);
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
-var client = http.createClient(PORT);
+var client = http.createClient(common.PORT);
 
 var body1 = "";
 var body2 = "";
@@ -57,7 +58,7 @@ req1.addListener('response', function (res1) {
       // parser that previously belonged to Client #1. But we're not finished
       // with Client #1 yet!
       //
-      var client2 = http.createClient(PORT);
+      var client2 = http.createClient(common.PORT);
 
       //
       // At this point, the bug would manifest itself and crash because the

test/simple/test-http-client-race.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 http = require("http");
 url = require("url");
 
@@ -12,9 +13,9 @@ var server = http.createServer(function (req, res) {
                       });
   res.end(body);
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
-var client = http.createClient(PORT);
+var client = http.createClient(common.PORT);
 
 var body1 = "";
 var body2 = "";

test/simple/test-http-client-upload.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 http = require("http");
 
 var sent_body = "";
@@ -22,16 +23,16 @@ var server = http.createServer(function(req, res) {
     res.end();
   });
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
-var client = http.createClient(PORT);
+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();
 
-error("client finished sending request");
+common.error("client finished sending request");
 
 req.addListener('response', function(res) {
   res.setEncoding("utf8");

test/simple/test-http-eof-on-connect.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 http = require("http");
 
@@ -7,9 +8,9 @@ http = require("http");
 // reproduceable on the first packet on the first connection to a server.
 
 server = http.createServer(function (req, res) {});
-server.listen(PORT);
+server.listen(common.PORT);
 
-net.createConnection(PORT).addListener("connect", function () {
+net.createConnection(common.PORT).addListener("connect", function () {
   this.close();
 }).addListener("close", function () {
 	server.close();

test/simple/test-http-exceptions.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 var http = require("http"),
   sys = require("sys"),
   server,
@@ -27,7 +28,7 @@ function check_reqs() {
 }
 
 function add_client(num) {
-  var req = http.createClient(PORT).request('GET', '/busy/' + num);
+  var req = http.createClient(common.PORT).request('GET', '/busy/' + num);
   req.end();
 
   req.addListener('response', function(res) {
@@ -46,7 +47,7 @@ function add_client(num) {
   return req;
 }
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
   for (req_num = 0; req_num < 4 ; req_num += 1) {
     client_requests.push(add_client(req_num));
   }

test/simple/test-http-full-response.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 // This test requires the program "ab"
 http = require("http");
 exec = require("child_process").exec;
@@ -19,7 +20,7 @@ server = http.createServer(function (req, res) {
 runs = 0;
 
 function runAb(opts, callback) {
-  var command = "ab " + opts + " http://127.0.0.1:" + PORT + "/";
+  var command = "ab " + opts + " http://127.0.0.1:" + common.PORT + "/";
   exec(command, function (err, stdout, stderr) {
     if (err) {
       console.log("ab not installed? skipping test.\n" + stderr);
@@ -45,7 +46,7 @@ function runAb(opts, callback) {
   });
 }
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
   runAb("-c 1 -n 10", function () {
     console.log("-c 1 -n 10 okay");
 

test/simple/test-http-head-request.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 assert = require("assert");
 http = require("http");
@@ -8,7 +9,7 @@ sys = require("sys");
 body = "hello world\n";
 
 server = http.createServer(function (req, res) {
-  error('req: ' + req.method);
+  common.error('req: ' + req.method);
   res.writeHead(200, {"Content-Length": body.length});
   res.end();
   server.close();
@@ -16,14 +17,14 @@ server = http.createServer(function (req, res) {
 
 var gotEnd = false;
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
-  var client = http.createClient(PORT);
+  var client = http.createClient(common.PORT);
   var request = client.request("HEAD", "/");
   request.end();
   request.addListener('response', function (response) {
-    error('response start');
+    common.error('response start');
     response.addListener("end", function () {
-      error('response end');
+      common.error('response end');
       gotEnd = true;
     });
   });

test/simple/test-http-head-response-has-no-body.js

@@ -1,4 +1,5 @@
-require('../common');
+common = require("../common");
+assert = common.assert
 
 var http = require('http');
 
@@ -10,17 +11,17 @@ var server = http.createServer(function(req, res) {
   res.writeHead(200); // broken: defaults to TE chunked
   res.end();
 });
-server.listen(PORT);
+server.listen(common.PORT);
 
 responseComplete = false;
 
-var req = http.createClient(PORT).request('HEAD', '/')
+var req = http.createClient(common.PORT).request('HEAD', '/')
-error('req');
+common.error('req');
 req.end();
 req.addListener('response', function (res) {
-  error('response');
+  common.error('response');
   res.addListener('end', function() {
-    error('response end');
+    common.error('response end');
     server.close();
     responseComplete = true;
   });

test/simple/test-http-malformed-request.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 http = require("http");
 url = require("url");
@@ -18,9 +19,9 @@ var s = http.createServer(function (req, res) {
 
   if (++nrequests_completed == nrequests_expected) s.close();
 });
-s.listen(PORT);
+s.listen(common.PORT);
 
-var c = net.createConnection(PORT);
+var c = net.createConnection(common.PORT);
 c.addListener("connect", function () {
   c.write("GET /hello?foo=%99bar HTTP/1.1\r\n\r\n");
   c.end();

test/simple/test-http-parser.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 
 // The purpose of this test is not to check HTTP compliance but to test the
 // binding. Tests for pathological http messages should be submitted

test/simple/test-http-proxy.js

@@ -1,12 +1,13 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 http = require("http");
 url = require("url");
 
-var PROXY_PORT = PORT;
+var PROXY_PORT = common.PORT;
-var BACKEND_PORT = PORT+1;
+var BACKEND_PORT = common.PORT+1;
 
 var backend = http.createServer(function (req, res) {
-  debug("backend request");
+  common.debug("backend request");
   res.writeHead(200, {"content-type": "text/plain"});
   res.write("hello world\n");
   res.end();
@@ -14,7 +15,7 @@ var backend = http.createServer(function (req, res) {
 
 var proxy_client = http.createClient(BACKEND_PORT);
 var proxy = http.createServer(function (req, res) {
-  debug("proxy req headers: " + JSON.stringify(req.headers));
+  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) {
@@ -24,7 +25,7 @@ var proxy = http.createServer(function (req, res) {
     });
     proxy_res.addListener("end", function() {
       res.end();
-      debug("proxy res");
+      common.debug("proxy res");
     });
   });
 });
@@ -38,25 +39,25 @@ function startReq () {
 
   var client = http.createClient(PROXY_PORT);
   var req = client.request("/test");
-  debug("client req")
+  common.debug("client req")
   req.addListener('response', function (res) {
-    debug("got res");
+    common.debug("got res");
     assert.equal(200, res.statusCode);
     res.setBodyEncoding("utf8");
     res.addListener('data', function (chunk) { body += chunk; });
     res.addListener('end', function () {
       proxy.close();
       backend.close();
-       debug("closed both");
+       common.debug("closed both");
     });
   });
   req.end();
 }
 
-debug("listen proxy")
+common.debug("listen proxy")
 proxy.listen(PROXY_PORT, startReq);
 
-debug("listen backend")
+common.debug("listen backend")
 backend.listen(BACKEND_PORT, startReq);
 
 process.addListener("exit", function () {

test/simple/test-http-server-multiheaders.js

@@ -2,7 +2,8 @@
 // of the same header as per RFC2616: joining the handful of fields by ', '
 // that support it, and dropping duplicates for other fields.
 
-require('../common');
+common = require("../common");
+assert = common.assert
 var http = require('http');
 
 var srv = http.createServer(function(req, res) {
@@ -17,8 +18,8 @@ var srv = http.createServer(function(req, res) {
   srv.close();
 });
 
-srv.listen(PORT, function () {
+srv.listen(common.PORT, function () {
-  var hc = http.createClient(PORT, 'localhost');
+  var hc = http.createClient(common.PORT, 'localhost');
   var hr = hc.request('/',
     [
       ['accept', 'abc'],

test/simple/test-http-server.js

@@ -1,4 +1,5 @@
-require("../common");
+common = require("../common");
+assert = common.assert
 net = require("net");
 http = require("http");
 url = require("url");
@@ -21,21 +22,21 @@ http.createServer(function (req, res) {
   }
 
   if (req.id == 1) {
-    error("req 1");
+    common.error("req 1");
     assert.equal("POST", req.method);
     assert.equal("/quit", url.parse(req.url).pathname);
   }
 
   if (req.id == 2) {
-    error("req 2");
+    common.error("req 2");
     assert.equal("foo", req.headers['x-x']);
   }
 
   if (req.id == 3) {
-    error("req 3");
+    common.error("req 3");
     assert.equal("bar", req.headers['x-x']);
     this.close();
-    error("server closed");
+    common.error("server closed");
   }
 
   setTimeout(function () {
@@ -44,9 +45,9 @@ http.createServer(function (req, res) {
     res.end();
   }, 1);
 
-}).listen(PORT);
+}).listen(common.PORT);
 
-var c = net.createConnection(PORT);
+var c = net.createConnection(common.PORT);
 
 c.setEncoding("utf8");
 

test/simple/test-http-set-timeout.js

@@ -1,25 +1,25 @@
-require("../common");
+common = require("../common");
-var sys = require('sys'),
+assert = common.assert;
-   http = require('http');
+http = require('http');
 
 server = http.createServer(function (req, res) {
   console.log('got request. setting 1 second timeout');
   req.connection.setTimeout(500);
 
   req.connection.addListener('timeout', function(){
-    sys.debug("TIMEOUT");
+    common.debug("TIMEOUT");
     server.close();
   });
 });
 
-server.listen(PORT, function () {
+server.listen(common.PORT, function () {
-  console.log('Server running at http://127.0.0.1:'+PORT+'/');
+  console.log('Server running at http://127.0.0.1:'+common.PORT+'/');
 
-  errorTimer =setTimeout(function () {
+  errorTimer = setTimeout(function () {
     throw new Error('Timeout was not sucessful');
   }, 2000);
 
-  http.cat('http://localhost:'+PORT+'/', 'utf8', function (err, content) {
+  http.cat('http://localhost:'+common.PORT+'/', 'utf8', function (err, content) {
     clearTimeout(errorTimer);
     console.log('HTTP REQUEST COMPLETE (this is good)');
   });