Remove process.mixin dependency from all tests.

test/common.js

@@ -1,5 +1,7 @@
 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");
@@ -7,8 +9,6 @@ exports.PORT = 12346;
 
 require.paths.unshift(exports.libDir);
 
-var assert = require('assert');
 var sys = require("sys");
-
+for (var i in sys) exports[i] = sys[i];
-process.mixin(exports, sys);
+exports.assert = require('assert');
-exports.assert = require('assert');

test/disabled/test-cat.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common.js"));
+require("../common.js");
 http = require("/http.js");
 
 puts("hello world");

test/disabled/test-dns.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var dns = require("dns"),
     sys = require("sys");

test/disabled/test-eio-race3.js

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

test/disabled/test-fs-sendfile.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 tcp = require("tcp");
 sys = require("sys");

test/disabled/test-http-stress.js

@@ -1,4 +1,4 @@
-process.mixin(require('../common.js'));
+require("../common");
 
 var request_count = 1000;
 var response_body = '{"ok": true}';

test/fixtures/echo.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 process.stdio.open();
 
 print("hello world\r\n");

test/fixtures/print-chars.js

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

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var tcp = require("tcp"),
     sys = require("sys"),

test/pummel/test-keep-alive.js

@@ -1,5 +1,5 @@
 // This test requires the program "ab"
-process.mixin(require("../common"));
+require("../common");
 http = require("http");
 sys = require("sys");
 

test/pummel/test-multipart.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var http = require("http"),
   multipart = require("multipart"),

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var N = 40;
 var finished = false;

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 // settings
 var bytes = 1024*40;

test/pummel/test-tcp-pause.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 N = 200;
 

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 
 

test/pummel/test-tcp-pingpong.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 
 var tests_run = 0;

test/pummel/test-tcp-throttle.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 N = 60*1024; // 30kb
 

test/pummel/test-tcp-timeout.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 exchanges = 0;
 starttime = null;

test/pummel/test-tcp-tls.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 fs=require("fs");
 

test/pummel/test-timers.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var WINDOW = 200; // why is does this need to be so big?
 

test/pummel/test-watch-file.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var fs = require("fs");
 var path = require("path");

test/simple/test-assert.js

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

test/simple/test-byte-length.js

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

test/simple/test-chdir.js

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

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 child = process.createChildProcess('/usr/bin/env', [], {'HELLO' : 'WORLD'});
 response = "";
 

test/simple/test-delayed-require.js

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

test/simple/test-eio-race.js

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

test/simple/test-eio-race2.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var testTxt = path.join(fixturesDir, "x.txt");
 var fs = require('fs');

test/simple/test-eio-race4.js

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

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

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

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

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

test/simple/test-exception-handler.js

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

test/simple/test-exec.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 success_count = 0;
 error_count = 0;

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require('fs');
 var got_error = false;

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

@@ -1,4 +1,4 @@
-process.mixin(require('../common'));
+require('../common');
 
 var
   path = require('path'),

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

@@ -1,4 +1,4 @@
-process.mixin(require('../common'));
+require('../common');
 
 var
   path = require('path'),

test/simple/test-fs-chmod.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require('fs');
 var got_error = false;

test/simple/test-fs-realpath.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var fs = require('fs');
 var path = require('path');
 var async_completed = 0, async_expected = 0, unlink = [];

test/simple/test-fs-stat.js

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

test/simple/test-fs-symlink.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require('fs');
 var completed = 0;

test/simple/test-fs-write.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require('fs');
 var fn = path.join(fixturesDir, "write.txt");

test/simple/test-http-1.0.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 http = require("http");
 

test/simple/test-http-cat.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 http = require("http");
 
 var body = "exports.A = function() { return 'A';}";

test/simple/test-http-chunked.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var http = require("http");
 
 var UTF8_STRING = "Il était tué";

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 http = require("http");
 url = require("url");
 

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 http = require("http");
 
 var sent_body = "";

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 http = require("http");
 

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 http = require("http");
 url = require("url");

test/simple/test-http-proxy.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 http = require("http");
 url = require("url");
 

test/simple/test-http-server.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 http = require("http");
 url = require("url");

test/simple/test-http-tls.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var http = require("http");
 var url = require("url");
 var fs = require('fs');

test/simple/test-http-wget.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 http = require("http");
 

test/simple/test-http.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 http = require("http");
 url = require("url");
 

test/simple/test-idle-watcher.js

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

test/simple/test-ini.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require("fs");
 parse = require("ini").parse;

test/simple/test-memory-usage.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var r = process.memoryUsage();
 puts(inspect(r));

test/simple/test-mkdir-rmdir.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require('fs');
 

test/simple/test-module-loading.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 
 debug("load test-module-loading.js");

test/simple/test-next-tick.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var complete = 0;
 

test/simple/test-path.js

@@ -1,5 +1,5 @@
 var path = require("path");
-process.mixin(require("../common"));
+require("../common");
 
 var f = __filename;
 

test/simple/test-process-buffering.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var pwd_called = false;
 

test/simple/test-process-kill.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var exit_status = -1;
 

test/simple/test-process-mixin.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var target = function() {};
 process.mixin(target, {
@@ -43,4 +43,4 @@ process.mixin(true, target, {
 });
 
 assert.notStrictEqual(['bar'], target.foo);
-assert.deepEqual(['bar'], target.foo);
+assert.deepEqual(['bar'], target.foo);

test/simple/test-process-simple.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var cat = process.createChildProcess("cat");
 

test/simple/test-querystring.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 // test using assert
 

test/simple/test-readdir.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 var fs = require('fs');
 

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

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var http = require('http');
 var sys = require('sys');

test/simple/test-signal-handler.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 puts("process.pid: " + process.pid);
 

test/simple/test-stdio.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 
 var sub = path.join(fixturesDir, 'echo.js');

test/simple/test-stdout-flush.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 var path = require('path');
 
 var sub = path.join(fixturesDir, 'print-chars.js');

test/simple/test-sync-fileread.js

@@ -1,4 +1,4 @@
-process.mixin(require('../common'));
+require('../common');
 var path = require('path');
 var fs = require('fs');
 

test/simple/test-sys.js

@@ -1,5 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
-process.mixin(require("sys"));
 
 assert.equal("0", inspect(0));
 assert.equal("1", inspect(1));

test/simple/test-tcp-binary.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 
 binaryString = "";

test/simple/test-tcp-reconnect.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 tcp = require("tcp");
 var N = 50;
 

test/simple/test-umask.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var mask = 0664;
 var old = process.umask(mask);

test/simple/test-url.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 var url = require("url"),
   sys = require("sys");

test/simple/test-utf8-scripts.js

@@ -1,4 +1,4 @@
-process.mixin(require("../common"));
+require("../common");
 
 // üäö