test: replace .addListener() calls with .on()

test/disabled/test-cat.js

@@ -70,7 +70,7 @@ promise.addErrback(function() {
   errors += 1;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(2, successes);
   assert.equal(0, errors);
 });

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

@@ -50,7 +50,7 @@ function test1(next) {
     assert.equal(child.stdout, null);
     assert.notEqual(child.stderr, null);
 
-    child.addListener('exit', function(err) {
+    child.on('exit', function(err) {
       if (err) throw err;
       fs.close(fd, function(error) {
         if (error) throw error;
@@ -77,10 +77,10 @@ function test2(next) {
 
     assert.equal(child.stdin, null);
     var actualData = '';
-    child.stdout.addListener('data', function(data) {
+    child.stdout.on('data', function(data) {
       actualData += data.toString();
     });
-    child.addListener('exit', function(code) {
+    child.on('exit', function(code) {
       if (err) throw err;
       assert.equal(actualData, 'hella warld\n');
       console.log('  File was filtered successfully');
@@ -98,16 +98,16 @@ function test3(next) {
   var filter = spawn(process.argv[0], [fixtPath('stdio-filter.js'), 'o', 'a']);
   var echo = spawn('/bin/echo', [expected], {customFds: [-1, filter.fds[0]]});
   var actualData = '';
-  filter.stdout.addListener('data', function(data) {
+  filter.stdout.on('data', function(data) {
     console.log('  Got data --> ' + data);
     actualData += data;
   });
-  filter.addListener('exit', function(code) {
+  filter.on('exit', function(code) {
     if (code) throw 'Return code was ' + code;
     assert.equal(actualData, 'hella warld\n');
     console.log('  Talked to another process successfully');
   });
-  echo.addListener('exit', function(code) {
+  echo.on('exit', function(code) {
     if (code) throw 'Return code was ' + code;
     filter.stdin.end();
     fs.unlinkSync(helloPath);

test/disabled/test-fs-sendfile.js

@@ -31,7 +31,7 @@ var x = path.join(common.fixturesDir, 'x.txt');
 var expected = 'xyz';
 
 var server = net.createServer(function(socket) {
-  socket.addListener('receive', function(data) {
+  socket.on('receive', function(data) {
     found = data;
     client.close();
     socket.close();
@@ -42,7 +42,7 @@ var server = net.createServer(function(socket) {
 server.listen(common.PORT);
 
 var client = net.createConnection(common.PORT);
-client.addListener('connect', function() {
+client.on('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

@@ -68,14 +68,14 @@ var proxy = http.createServer(function(req, res) {
 
     var count = 0;
 
-    proxy_res.addListener('data', function(d) {
+    proxy_res.on('data', function(d) {
       if (count++ % 1000 == 0) common.print('.');
       res.write(d);
       sent += d.length;
       assert.ok(sent <= (len * chunk.length));
     });
 
-    proxy_res.addListener('end', function() {
+    proxy_res.on('end', function() {
       res.end();
     });
 
@@ -102,12 +102,12 @@ function call_chargen(list) {
       headers: {'x-len': len}
     }, function(res) {
 
-      res.addListener('data', function(d) {
+      res.on('data', function(d) {
         recved += d.length;
         assert.ok(recved <= (len * chunk.length));
       });
 
-      res.addListener('end', function() {
+      res.on('end', function() {
         assert.ok(recved <= (len * chunk.length));
         common.debug('end for ' + len + ' chunks.');
         call_chargen(list);
@@ -130,6 +130,6 @@ function ready() {
   call_chargen([100, 1000, 10000, 100000, 1000000]);
 }
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(done);
 });

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

@@ -44,17 +44,17 @@ server.listen(common.PORT);
 
 var gotEnd = false;
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var request = http.request({
     port: common.PORT,
     method: 'HEAD',
     path: '/'
   }, function(response) {
     console.log('got response');
-    response.addListener('data', function() {
+    response.on('data', function() {
       process.exit(2);
     });
-    response.addListener('end', function() {
+    response.on('end', function() {
       process.exit(0);
     });
   });

test/disabled/test-http-stress.js

@@ -40,7 +40,7 @@ server.listen(common.PORT);
 var requests_ok = 0;
 var requests_complete = 0;
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   for (var i = 0; i < request_count; i++) {
     http.cat('http://localhost:' + common.PORT + '/', 'utf8',
              function(err, content) {
@@ -60,7 +60,7 @@ server.addListener('listening', function() {
   }
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(request_count, requests_complete);
   assert.equal(request_count, requests_ok);
 });

test/disabled/test-http-tls.js

@@ -111,16 +111,16 @@ var https_server = http.createServer(function(req, res) {
 https_server.setSecure(credentials);
 https_server.listen(common.PORT);
 
-https_server.addListener('listening', function() {
+https_server.on('listening', function() {
   var c = net.createConnection(common.PORT);
 
   c.setEncoding('utf8');
 
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     c.setSecure(credentials);
   });
 
-  c.addListener('secure', function() {
+  c.on('secure', function() {
     var verified = c.verifyPeer();
     var peerDN = JSON.stringify(c.getPeerCertificate());
     assert.equal(verified, true);
@@ -137,7 +137,7 @@ https_server.addListener('listening', function() {
     requests_sent += 1;
   });
 
-  c.addListener('data', function(chunk) {
+  c.on('data', function(chunk) {
     server_response += chunk;
 
     if (requests_sent == 1) {
@@ -155,16 +155,16 @@ https_server.addListener('listening', function() {
 
   });
 
-  c.addListener('end', function() {
+  c.on('end', function() {
     client_got_eof = true;
   });
 
-  c.addListener('close', function() {
+  c.on('close', function() {
     assert.equal(c.readyState, 'closed');
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(4, request_number);
   assert.equal(4, requests_sent);
 

test/disabled/test-idle-watcher.js

@@ -34,6 +34,6 @@ idle.callback = function() {
 idle.setPriority(process.EVMAXPRI);
 idle.start();
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(complete);
 });

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

@@ -41,21 +41,21 @@ function fdPassingTest(path, port) {
   var initializeSender = function() {
     var fdHighway = new net.Socket();
 
-    fdHighway.addListener('connect', function() {
+    fdHighway.on('connect', function() {
       var sender = net.createServer(function(socket) {
         fdHighway.sendFD(socket);
         socket.flush();
         socket.forceClose(); // want to close() the fd, not shutdown()
       });
 
-      sender.addListener('listening', function() {
+      sender.on('listening', function() {
         var client = net.createConnection(port);
 
-        client.addListener('connect', function() {
+        client.on('connect', function() {
           client.write(message);
         });
 
-        client.addListener('data', function(data) {
+        client.on('data', function(data) {
           assert.equal(expectedData[0], data);
           if (expectedData.length > 1) {
             expectedData.shift();
@@ -78,7 +78,7 @@ function fdPassingTest(path, port) {
 
   };
 
-  receiver.addListener('output', function(data) {
+  receiver.on('output', function(data) {
     var initialized = false;
     if ((! initialized) && (data == 'ready')) {
       initializeSender();
@@ -89,6 +89,6 @@ function fdPassingTest(path, port) {
 
 fdPassingTest('/tmp/passing-socket-test', 31075);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, tests_run);
 });

test/disabled/test-net-tls-pummel.js

@@ -47,7 +47,7 @@ function tlsTest(port, host, caPem, keyPem, certPem) {
     socket.setNoDelay();
     socket.timeout = 0;
 
-    socket.addListener('data', function(data) {
+    socket.on('data', function(data) {
       var verified = socket.verifyPeer();
       var peerDN = socket.getPeerCertificate('DNstring');
       assert.equal(verified, 1);
@@ -62,12 +62,12 @@ function tlsTest(port, host, caPem, keyPem, certPem) {
       }
     });
 
-    socket.addListener('end', function() {
+    socket.on('end', function() {
       assert.equal('writeOnly', socket.readyState);
       socket.end();
     });
 
-    socket.addListener('close', function(had_error) {
+    socket.on('close', function(had_error) {
       assert.equal(false, had_error);
       assert.equal('closed', socket.readyState);
       socket.server.close();
@@ -82,7 +82,7 @@ function tlsTest(port, host, caPem, keyPem, certPem) {
   client.setEncoding('utf8');
   client.setSecure('X509_PEM', caPem, 0, keyPem, caPem);
 
-  client.addListener('connect', function() {
+  client.on('connect', function() {
     assert.equal('open', client.readyState);
     var verified = client.verifyPeer();
     var peerDN = client.getPeerCertificate('DNstring');
@@ -93,7 +93,7 @@ function tlsTest(port, host, caPem, keyPem, certPem) {
     client.write('PING');
   });
 
-  client.addListener('data', function(data) {
+  client.on('data', function(data) {
     assert.equal('PONG', data);
     count += 1;
 
@@ -115,7 +115,7 @@ function tlsTest(port, host, caPem, keyPem, certPem) {
     }
   });
 
-  client.addListener('close', function() {
+  client.on('close', function() {
     assert.equal(N + 1, count);
     assert.equal(true, sent_final_ping);
     tests_run += 1;
@@ -141,7 +141,7 @@ if (have_tls) {
   tlsTest(common.PORT, 'localhost', caPem, keyPem, certPem);
   tlsTest(common.PORT + 1, null, caPem, keyPem, certPem);
 
-  process.addListener('exit', function() {
+  process.on('exit', function() {
     assert.equal(2, tests_run);
   });
 } else {

test/disabled/test-net-tls.js

@@ -63,7 +63,7 @@ var secureServer = net.createServer(function(connection) {
   connection.setSecure(credentials);
   connection.setEncoding('UTF8');
 
-  connection.addListener('secure', function() {
+  connection.on('secure', function() {
     gotSecureServer = true;
     var verified = connection.verifyPeer();
     var peerDN = JSON.stringify(connection.getPeerCertificate());
@@ -80,12 +80,12 @@ var secureServer = net.createServer(function(connection) {
 
   });
 
-  connection.addListener('data', function(chunk) {
+  connection.on('data', function(chunk) {
     serverData += chunk;
     connection.write(chunk);
   });
 
-  connection.addListener('end', function() {
+  connection.on('end', function() {
     assert.equal(serverData, testData);
     connection.end();
     self.close();
@@ -93,15 +93,15 @@ var secureServer = net.createServer(function(connection) {
 });
 secureServer.listen(common.PORT);
 
-secureServer.addListener('listening', function() {
+secureServer.on('listening', function() {
   var secureClient = net.createConnection(common.PORT);
 
   secureClient.setEncoding('UTF8');
-  secureClient.addListener('connect', function() {
+  secureClient.on('connect', function() {
     secureClient.setSecure(credentials);
   });
 
-  secureClient.addListener('secure', function() {
+  secureClient.on('secure', function() {
     gotSecureClient = true;
     var verified = secureClient.verifyPeer();
     var peerDN = JSON.stringify(secureClient.getPeerCertificate());
@@ -120,16 +120,16 @@ secureServer.addListener('listening', function() {
     secureClient.end();
   });
 
-  secureClient.addListener('data', function(chunk) {
+  secureClient.on('data', function(chunk) {
     clientData += chunk;
   });
 
-  secureClient.addListener('end', function() {
+  secureClient.on('end', function() {
     assert.equal(clientData, testData);
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(gotSecureServer, 'Did not get secure event for server');
   assert.ok(gotSecureClient, 'Did not get secure event for client');
 });

test/disabled/test-process-title.js

@@ -40,8 +40,8 @@ function verifyProcessName(str, callback) {
   var buf = '';
   ps = spawn('ps');
   ps.stdout.setEncoding('utf8');
-  ps.stdout.addListener('data', function(s) { buf += s; });
+  ps.stdout.on('data', function(s) { buf += s; });
-  ps.addListener('exit', function(c) {
+  ps.on('exit', function(c) {
     try {
       assert.equal(0, c);
       assert.ok(new RegExp(process.pid + ' ', 'm').test(buf));

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

@@ -57,6 +57,6 @@ util.exec(cmd, function(err, stdout, stderr) {
   server.close();
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, modulesLoaded);
 });

test/disabled/test-sendfd.js

@@ -91,7 +91,7 @@ assert.equal(pipeFDs.length, 2);
 var seenOrdinals = [];
 
 var pipeReadStream = new net.Stream();
-pipeReadStream.addListener('data', function(data) {
+pipeReadStream.on('data', function(data) {
   data.toString('utf8').trim().split('\n').forEach(function(d) {
     var rd = JSON.parse(d);
 
@@ -121,7 +121,7 @@ var srv = net.createServer(function(s) {
   if (s.write(buf, pipeFDs[1])) {
     netBinding.close(pipeFDs[1]);
   } else {
-    s.addListener('drain', function() {
+    s.on('drain', function() {
       netBinding.close(pipeFDs[1]);
     });
   }
@@ -133,12 +133,12 @@ var cp = child_process.spawn(process.argv[0],
                              [path.join(common.fixturesDir, 'recvfd.js'),
                               SOCK_PATH]);
 
-cp.stdout.addListener('data', logChild);
+cp.stdout.on('data', logChild);
-cp.stderr.addListener('data', logChild);
+cp.stderr.on('data', logChild);
 
 // When the child exits, clean up and validate its exit status
 var cpp = cp.pid;
-cp.addListener('exit', function(code, signal) {
+cp.on('exit', function(code, signal) {
   srv.close();
   // fs.unlinkSync(SOCK_PATH);
 

test/disabled/tls_client.js

@@ -45,23 +45,23 @@ try {
 }
 
 client.setEncoding('UTF8');
-client.addListener('connect', function() {
+client.on('connect', function() {
   console.log('client connected.');
   client.setSecure(credentials);
 });
 
-client.addListener('secure', function() {
+client.on('secure', function() {
   console.log('client secure : ' + JSON.stringify(client.getCipher()));
   console.log(JSON.stringify(client.getPeerCertificate()));
   console.log('verifyPeer : ' + client.verifyPeer());
   client.write('GET / HTTP/1.0\r\n\r\n');
 });
 
-client.addListener('data', function(chunk) {
+client.on('data', function(chunk) {
   common.error(chunk);
 });
 
-client.addListener('end', function() {
+client.on('end', function() {
   console.log('client disconnected.');
 });
 

test/disabled/tls_server.js

@@ -44,11 +44,11 @@ var server = net.createServer(function(connection) {
   connection.setSecure(credentials);
   connection.setEncoding('binary');
 
-  connection.addListener('secure', function() {
+  connection.on('secure', function() {
     //console.log('Secure');
   });
 
-  connection.addListener('data', function(chunk) {
+  connection.on('data', function(chunk) {
     console.log('recved: ' + JSON.stringify(chunk));
     connection.write('HTTP/1.0 200 OK\r\n' +
                      'Content-type: text/plain\r\n' +
@@ -60,7 +60,7 @@ var server = net.createServer(function(connection) {
     connection.end();
   });
 
-  connection.addListener('end', function() {
+  connection.on('end', function() {
     connection.end();
   });
 

test/fixtures/a.js

@@ -41,6 +41,6 @@ exports.D = function() {
 
 exports.number = 42;
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   string = 'A done';
 });

test/fixtures/b/c.js

@@ -43,7 +43,7 @@ exports.D = function() {
   return d.D();
 };
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   string = 'C done';
   console.log('b/c.js exit');
 });

test/fixtures/b/d.js

@@ -27,7 +27,7 @@ exports.D = function() {
   return string;
 };
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   string = 'D done';
 });
 

test/fixtures/echo.js

@@ -26,10 +26,10 @@ common.print('hello world\r\n');
 
 var stdin = process.openStdin();
 
-stdin.addListener('data', function(data) {
+stdin.on('data', function(data) {
   process.stdout.write(data.toString());
 });
 
-stdin.addListener('end', function() {
+stdin.on('end', function() {
   process.stdout.end();
 });

test/fixtures/net-fd-passing-receiver.js

@@ -26,19 +26,19 @@ path = process.ARGV[2];
 greeting = process.ARGV[3];
 
 receiver = net.createServer(function(socket) {
-  socket.addListener('fd', function(fd) {
+  socket.on('fd', function(fd) {
     var peerInfo = process.getpeername(fd);
     peerInfo.fd = fd;
     var passedSocket = new net.Socket(peerInfo);
 
-    passedSocket.addListener('eof', function() {
+    passedSocket.on('eof', function() {
       passedSocket.close();
     });
 
-    passedSocket.addListener('data', function(data) {
+    passedSocket.on('data', function(data) {
       passedSocket.send('[echo] ' + data);
     });
-    passedSocket.addListener('close', function() {
+    passedSocket.on('close', function() {
       receiver.close();
     });
     passedSocket.send('[greeting] ' + greeting);
@@ -46,7 +46,7 @@ receiver = net.createServer(function(socket) {
 });
 
 /* To signal the test runne we're up and listening */
-receiver.addListener('listening', function() {
+receiver.on('listening', function() {
   common.print('ready');
 });
 

test/fixtures/recvfd.js

@@ -51,7 +51,7 @@ function processData(s) {
     }
   };
 
-  pipeStream.addListener('drain', drainFunc);
+  pipeStream.on('drain', drainFunc);
   pipeStream.resume();
 
   if (pipeStream.write(JSON.stringify(d) + '\n')) {
@@ -62,11 +62,11 @@ function processData(s) {
 // Create a UNIX socket to the path defined by argv[2] and read a file
 // descriptor and misc data from it.
 var s = new net.Stream();
-s.addListener('fd', function(fd) {
+s.on('fd', function(fd) {
   receivedFDs.unshift(fd);
   processData(s);
 });
-s.addListener('data', function(data) {
+s.on('data', function(data) {
   data.toString('utf8').trim().split('\n').forEach(function(d) {
     receivedData.unshift(JSON.parse(d));
   });

test/fixtures/should_exit.js

@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 function tmp() {}
-process.addListener('SIGINT', tmp);
+process.on('SIGINT', tmp);
 process.removeListener('SIGINT', tmp);
 setInterval(function() {
   process.stdout.write('keep alive\n');

test/fixtures/stdio-filter.js

@@ -26,7 +26,7 @@ var replacement = process.argv[3];
 var re = new RegExp(regexIn, 'g');
 var stdin = process.openStdin();
 
-stdin.addListener('data', function(data) {
+stdin.on('data', function(data) {
   data = data.toString();
   process.stdout.write(data.replace(re, replacement));
 });

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

@@ -36,15 +36,15 @@ function doSpawn(i) {
   var count = 0;
 
   child.stdout.setEncoding('ascii');
-  child.stdout.addListener('data', function(chunk) {
+  child.stdout.on('data', function(chunk) {
     count += chunk.length;
   });
 
-  child.stderr.addListener('data', function(chunk) {
+  child.stderr.on('data', function(chunk) {
     console.log('stderr: ' + chunk);
   });
 
-  child.addListener('exit', function() {
+  child.on('exit', function() {
     assert.equal(SIZE + 1, count); // + 1 for \n
     if (i < N) {
       doSpawn(i + 1);
@@ -56,6 +56,6 @@ function doSpawn(i) {
 
 doSpawn(0);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(finished);
 });

test/pummel/test-exec.js

@@ -105,7 +105,7 @@ exec('python -c "print 200000*\'C\'"', {maxBuffer: 1000},
        assert.ok(/maxBuffer/.test(err.message));
      });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, success_count);
   assert.equal(1, error_count);
 });

test/pummel/test-fs-watch-file.js

@@ -41,7 +41,7 @@ var filepathTwo = filenameTwo;
 var filepathTwoAbs = path.join(testDir, filenameTwo);
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   fs.unlinkSync(filepathOne);
   fs.unlinkSync(filepathTwoAbs);
   assert.equal(1, watchSeenOne);

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

@@ -36,13 +36,13 @@ var server = net.createServer(function(socket) {
 server.on('listening', function() {
   var client = http.createClient(common.PORT);
 
-  client.addListener('error', function(err) {
+  client.on('error', function(err) {
     // We should receive one error
     console.log('ERROR! ' + err.message);
     errorCount++;
   });
 
-  client.addListener('end', function() {
+  client.on('end', function() {
     // When we remove the old Client interface this will most likely have to be
     // changed.
     console.log('EOF!');
@@ -51,7 +51,7 @@ server.on('listening', function() {
 
   var request = client.request('GET', '/', {'host': 'localhost'});
   request.end();
-  request.addListener('response', function(response) {
+  request.on('response', function(response) {
     console.log('STATUS: ' + response.statusCode);
   });
 });
@@ -63,7 +63,7 @@ setTimeout(function() {
 }, 500);
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, errorCount);
   assert.equal(1, eofCount);
 });

test/pummel/test-keep-alive.js

@@ -83,7 +83,7 @@ server.listen(common.PORT, function() {
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(true, normalReqSec > 50);
   assert.equal(true, keepAliveReqSec > 50);
   assert.equal(true, normalReqSec < keepAliveReqSec);

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

@@ -37,7 +37,7 @@ for (var i = 0; i < bytes; i++) {
 }
 
 var server = net.createServer(function(c) {
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     total_connections++;
     common.print('#');
     c.write(body);
@@ -52,26 +52,26 @@ function runClient(callback) {
 
   client.setEncoding('utf8');
 
-  client.addListener('connect', function() {
+  client.on('connect', function() {
     common.print('c');
     client.recved = '';
     client.connections += 1;
   });
 
-  client.addListener('data', function(chunk) {
+  client.on('data', function(chunk) {
     this.recved += chunk;
   });
 
-  client.addListener('end', function() {
+  client.on('end', function() {
     client.end();
   });
 
-  client.addListener('error', function(e) {
+  client.on('error', function(e) {
     console.log('\n\nERROOOOOr');
     throw e;
   });
 
-  client.addListener('close', function(had_error) {
+  client.on('close', function(had_error) {
     common.print('.');
     assert.equal(false, had_error);
     assert.equal(bytes, client.recved.length);
@@ -98,7 +98,7 @@ server.listen(common.PORT, function() {
   }
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(connections_per_client * concurrency, total_connections);
   console.log('\nokay!');
 });

test/pummel/test-net-pause.js

@@ -43,7 +43,7 @@ var server = net.createServer(function(connection) {
 server.on('listening', function() {
   var client = net.createConnection(common.PORT);
   client.setEncoding('ascii');
-  client.addListener('data', function(d) {
+  client.on('data', function(d) {
     common.print(d);
     recv += d;
   });
@@ -76,14 +76,14 @@ server.on('listening', function() {
 
   }, 500);
 
-  client.addListener('end', function() {
+  client.on('end', function() {
     server.close();
     client.end();
   });
 });
 server.listen(common.PORT);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(N, recv.length);
   common.debug('Exit');
 });

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

@@ -35,7 +35,7 @@ function pingPongTest(port, host, on_complete) {
   var server = net.createServer({ allowHalfOpen: true }, function(socket) {
     socket.setEncoding('utf8');
 
-    socket.addListener('data', function(data) {
+    socket.on('data', function(data) {
       console.log(data);
       assert.equal('PING', data);
       assert.equal('open', socket.readyState);
@@ -46,18 +46,18 @@ function pingPongTest(port, host, on_complete) {
       }, DELAY);
     });
 
-    socket.addListener('timeout', function() {
+    socket.on('timeout', function() {
       common.debug('server-side timeout!!');
       assert.equal(false, true);
     });
 
-    socket.addListener('end', function() {
+    socket.on('end', function() {
       console.log('server-side socket EOF');
       assert.equal('writeOnly', socket.readyState);
       socket.end();
     });
 
-    socket.addListener('close', function(had_error) {
+    socket.on('close', function(had_error) {
       console.log('server-side socket.end');
       assert.equal(false, had_error);
       assert.equal('closed', socket.readyState);
@@ -70,12 +70,12 @@ function pingPongTest(port, host, on_complete) {
 
     client.setEncoding('utf8');
 
-    client.addListener('connect', function() {
+    client.on('connect', function() {
       assert.equal('open', client.readyState);
       client.write('PING');
     });
 
-    client.addListener('data', function(data) {
+    client.on('data', function(data) {
       console.log(data);
       assert.equal('PONG', data);
       assert.equal('open', client.readyState);
@@ -92,12 +92,12 @@ function pingPongTest(port, host, on_complete) {
       }, DELAY);
     });
 
-    client.addListener('timeout', function() {
+    client.on('timeout', function() {
       common.debug('client-side timeout!!');
       assert.equal(false, true);
     });
 
-    client.addListener('close', function() {
+    client.on('close', function() {
       console.log('client.end');
       assert.equal(N + 1, count);
       assert.ok(client_ended);
@@ -109,6 +109,6 @@ function pingPongTest(port, host, on_complete) {
 
 pingPongTest(common.PORT);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, tests_run);
 });

test/pummel/test-net-pingpong.js

@@ -48,7 +48,7 @@ function pingPongTest(port, host, on_complete) {
     socket.setNoDelay();
     socket.timeout = 0;
 
-    socket.addListener('data', function(data) {
+    socket.on('data', function(data) {
       console.log('server got: ' + JSON.stringify(data));
       assert.equal('open', socket.readyState);
       assert.equal(true, count <= N);
@@ -57,12 +57,12 @@ function pingPongTest(port, host, on_complete) {
       }
     });
 
-    socket.addListener('end', function() {
+    socket.on('end', function() {
       assert.equal('writeOnly', socket.readyState);
       socket.end();
     });
 
-    socket.addListener('close', function(had_error) {
+    socket.on('close', function(had_error) {
       assert.equal(false, had_error);
       assert.equal('closed', socket.readyState);
       socket.server.close();
@@ -74,12 +74,12 @@ function pingPongTest(port, host, on_complete) {
 
     client.setEncoding('utf8');
 
-    client.addListener('connect', function() {
+    client.on('connect', function() {
       assert.equal('open', client.readyState);
       client.write('PING');
     });
 
-    client.addListener('data', function(data) {
+    client.on('data', function(data) {
       console.log('client got: ' + data);
 
       assert.equal('PONG', data);
@@ -101,7 +101,7 @@ function pingPongTest(port, host, on_complete) {
       }
     });
 
-    client.addListener('close', function() {
+    client.on('close', function() {
       assert.equal(N + 1, count);
       assert.equal(true, sent_final_ping);
       if (on_complete) on_complete();
@@ -118,6 +118,6 @@ pingPongTest(common.PORT + 1, null);
 var solaris = /sunos/i.test(process.platform);
 if (!solaris) pingPongTest(common.PORT + 2, '::1');
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(solaris ? 2 : 3, tests_run);
 });

test/pummel/test-net-throttle.js

@@ -39,7 +39,7 @@ for (var i = 0; i < N; i++) {
 console.log('start server on port ' + common.PORT);
 
 var server = net.createServer(function(connection) {
-  connection.addListener('connect', function() {
+  connection.on('connect', function() {
     assert.equal(false, connection.write(body));
     console.log('bufferSize: ' + connection.bufferSize);
     assert.ok(0 <= connection.bufferSize &&
@@ -52,7 +52,7 @@ server.listen(common.PORT, function() {
   var paused = false;
   var client = net.createConnection(common.PORT);
   client.setEncoding('ascii');
-  client.addListener('data', function(d) {
+  client.on('data', function(d) {
     chars_recved += d.length;
     console.log('got ' + chars_recved);
     if (!paused) {
@@ -70,7 +70,7 @@ server.listen(common.PORT, function() {
     }
   });
 
-  client.addListener('end', function() {
+  client.on('end', function() {
     server.close();
     client.end();
   });
@@ -78,7 +78,7 @@ server.listen(common.PORT, function() {
 
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(N, chars_recved);
   assert.equal(true, npauses > 2);
 });

test/pummel/test-net-timeout.js

@@ -31,24 +31,24 @@ var timeout = 1000;
 var echo_server = net.createServer(function(socket) {
   socket.setTimeout(timeout);
 
-  socket.addListener('timeout', function() {
+  socket.on('timeout', function() {
     console.log('server timeout');
     timeouttime = new Date;
     console.dir(timeouttime);
     socket.destroy();
   });
 
-  socket.addListener('error', function(e) {
+  socket.on('error', function(e) {
     throw new Error('Server side socket should not get error. ' +
                       'We disconnect willingly.');
   });
 
-  socket.addListener('data', function(d) {
+  socket.on('data', function(d) {
     console.log(d);
     socket.write(d);
   });
 
-  socket.addListener('end', function() {
+  socket.on('end', function() {
     socket.end();
   });
 });
@@ -59,12 +59,12 @@ echo_server.listen(common.PORT, function() {
   var client = net.createConnection(common.PORT);
   client.setEncoding('UTF8');
   client.setTimeout(0); // disable the timeout for client
-  client.addListener('connect', function() {
+  client.on('connect', function() {
     console.log('client connected.');
     client.write('hello\r\n');
   });
 
-  client.addListener('data', function(chunk) {
+  client.on('data', function(chunk) {
     assert.equal('hello\r\n', chunk);
     if (exchanges++ < 5) {
       setTimeout(function() {
@@ -80,22 +80,22 @@ echo_server.listen(common.PORT, function() {
     }
   });
 
-  client.addListener('timeout', function() {
+  client.on('timeout', function() {
     throw new Error("client timeout - this shouldn't happen");
   });
 
-  client.addListener('end', function() {
+  client.on('end', function() {
     console.log('client end');
     client.end();
   });
 
-  client.addListener('close', function() {
+  client.on('close', function() {
     console.log('client disconnect');
     echo_server.close();
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(starttime != null);
   assert.ok(timeouttime != null);
 

test/pummel/test-timers.js

@@ -120,7 +120,7 @@ var z = setTimeout(t, 200);
 clearTimeout(y);
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(true, setTimeout_called);
   assert.equal(3, interval_count);
   assert.equal(11, count4);

test/pummel/test-watch-file.js

@@ -49,6 +49,6 @@ var fd = fs.openSync(f, 'w+');
 fs.writeSync(fd, 'xyz\n');
 fs.closeSync(fd);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(changes > 0);
 });

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

@@ -31,12 +31,12 @@ function pwd(callback) {
   var child = common.spawnPwd();
 
   child.stdout.setEncoding('utf8');
-  child.stdout.addListener('data', function(s) {
+  child.stdout.on('data', function(s) {
     console.log('stdout: ' + JSON.stringify(s));
     output += s;
   });
 
-  child.addListener('exit', function(c) {
+  child.on('exit', function(c) {
     console.log('exit: ' + c);
     assert.equal(0, c);
     callback(output);
@@ -51,6 +51,6 @@ pwd(function(result) {
   assert.equal('\n', result[result.length - 1]);
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(true, pwd_called);
 });

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

@@ -39,11 +39,11 @@ function testCwd(options, forCode, forData) {
 
   child.stdout.setEncoding('utf8');
 
-  child.stdout.addListener('data', function(chunk) {
+  child.stdout.on('data', function(chunk) {
     data += chunk;
   });
 
-  child.addListener('exit', function(code, signal) {
+  child.on('exit', function(code, signal) {
     forData && assert.strictEqual(forData, data.replace(/[\s\r\n]+$/, ''));
     assert.strictEqual(forCode, code);
     returns--;
@@ -73,6 +73,6 @@ testCwd({cwd: null}, 0);
 
 // Check whether all tests actually returned
 assert.notEqual(0, returns);
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(0, returns);
 });

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

@@ -44,12 +44,12 @@ var response = '';
 
 child.stdout.setEncoding('utf8');
 
-child.stdout.addListener('data', function(chunk) {
+child.stdout.on('data', function(chunk) {
   console.log('stdout: ' + chunk);
   response += chunk;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(response.indexOf('HELLO=WORLD') >= 0);
   assert.ok(response.indexOf('FOO=BAR') >= 0);
 });

test/simple/test-child-process-exec-cwd.js

@@ -50,7 +50,7 @@ var child = exec(pwdcommand, {cwd: dir}, function(err, stdout, stderr) {
   }
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, success_count);
   assert.equal(0, error_count);
 });

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

@@ -50,11 +50,11 @@ if (process.platform !== 'win32') {
 }
 
 child.stdout.setEncoding('utf8');
-child.stdout.addListener('data', function(chunk) {
+child.stdout.on('data', function(chunk) {
   response += chunk;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   console.log('response: ', response);
   assert.equal(1, success_count);
   assert.equal(0, error_count);

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

@@ -28,7 +28,7 @@ var exits = 0;
 
 var exitScript = path.join(common.fixturesDir, 'exit.js');
 var exitChild = spawn(process.argv[0], [exitScript, 23]);
-exitChild.addListener('exit', function(code, signal) {
+exitChild.on('exit', function(code, signal) {
   assert.strictEqual(code, 23);
   assert.strictEqual(signal, null);
 
@@ -40,7 +40,7 @@ exitChild.addListener('exit', function(code, signal) {
 var errorScript = path.join(common.fixturesDir,
                             'child_process_should_emit_error.js');
 var errorChild = spawn(process.argv[0], [errorScript]);
-errorChild.addListener('exit', function(code, signal) {
+errorChild.on('exit', function(code, signal) {
   assert.ok(code !== 0);
   assert.strictEqual(signal, null);
 
@@ -48,6 +48,6 @@ errorChild.addListener('exit', function(code, signal) {
 });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(2, exits);
 });

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

@@ -33,13 +33,13 @@ var gotEcho = false;
 
 var child = spawn(process.argv[0], [sub]);
 
-child.stderr.addListener('data', function(data) {
+child.stderr.on('data', function(data) {
   console.log('parent stderr: ' + data);
 });
 
 child.stdout.setEncoding('utf8');
 
-child.stdout.addListener('data', function(data) {
+child.stdout.on('data', function(data) {
   console.log('child said: ' + JSON.stringify(data));
   if (!gotHelloWorld) {
     assert.equal('hello world\r\n', data);
@@ -52,12 +52,12 @@ child.stdout.addListener('data', function(data) {
   }
 });
 
-child.stdout.addListener('end', function(data) {
+child.stdout.on('end', function(data) {
   console.log('child end');
 });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(gotHelloWorld);
   assert.ok(gotEcho);
 });

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

@@ -35,30 +35,30 @@ var gotStderrEOF = false;
 var cat = spawn('cat');
 
 
-cat.stdout.addListener('data', function(chunk) {
+cat.stdout.on('data', function(chunk) {
   assert.ok(false);
 });
 
-cat.stdout.addListener('end', function() {
+cat.stdout.on('end', function() {
   gotStdoutEOF = true;
 });
 
-cat.stderr.addListener('data', function(chunk) {
+cat.stderr.on('data', function(chunk) {
   assert.ok(false);
 });
 
-cat.stderr.addListener('end', function() {
+cat.stderr.on('end', function() {
   gotStderrEOF = true;
 });
 
-cat.addListener('exit', function(code, signal) {
+cat.on('exit', function(code, signal) {
   exitCode = code;
   termSignal = signal;
 });
 
 cat.kill();
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.strictEqual(exitCode, null);
   assert.strictEqual(termSignal, 'SIGTERM');
   assert.ok(gotStdoutEOF);

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

@@ -40,35 +40,35 @@ var exitStatus = -1;
 var gotStdoutEOF = false;
 
 cat.stdout.setEncoding('utf8');
-cat.stdout.addListener('data', function(chunk) {
+cat.stdout.on('data', function(chunk) {
   console.log('stdout: ' + chunk);
   response += chunk;
 });
 
-cat.stdout.addListener('end', function() {
+cat.stdout.on('end', function() {
   gotStdoutEOF = true;
 });
 
 
 var gotStderrEOF = false;
 
-cat.stderr.addListener('data', function(chunk) {
+cat.stderr.on('data', function(chunk) {
   // shouldn't get any stderr output
   assert.ok(false);
 });
 
-cat.stderr.addListener('end', function(chunk) {
+cat.stderr.on('end', function(chunk) {
   gotStderrEOF = true;
 });
 
 
-cat.addListener('exit', function(status) {
+cat.on('exit', function(status) {
   console.log('exit event');
   exitStatus = status;
   assert.equal('hello world', response);
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(0, exitStatus);
   assert.equal('hello world', response);
 });

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

@@ -35,18 +35,18 @@ var child = spawn(process.argv[0], [sub, n]);
 var count = 0;
 
 child.stderr.setEncoding('utf8');
-child.stderr.addListener('data', function(data) {
+child.stderr.on('data', function(data) {
   console.log('parent stderr: ' + data);
   assert.ok(false);
 });
 
 child.stderr.setEncoding('utf8');
-child.stdout.addListener('data', function(data) {
+child.stdout.on('data', function(data) {
   count += data.length;
   console.log(count);
 });
 
-child.addListener('exit', function(data) {
+child.on('exit', function(data) {
   assert.equal(n, count);
   console.log('okay');
 });

test/simple/test-crypto.js

@@ -269,10 +269,10 @@ assert.equal(h1, h2, 'multipled updates');
 var fn = path.join(common.fixturesDir, 'sample.png');
 var sha1Hash = crypto.createHash('sha1');
 var fileStream = fs.createReadStream(fn);
-fileStream.addListener('data', function(data) {
+fileStream.on('data', function(data) {
   sha1Hash.update(data);
 });
-fileStream.addListener('close', function() {
+fileStream.on('close', function() {
   assert.equal(sha1Hash.digest('hex'),
                '22723e553129a336ad96e10f6aecdf0f45e4149e',
                'Test SHA1 of sample.png');

test/simple/test-delayed-require.js

@@ -27,7 +27,7 @@ setTimeout(function() {
   a = require('../fixtures/a');
 }, 50);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(true, 'A' in a);
   assert.equal('A', a.A());
   assert.equal('D', a.D());

test/simple/test-dgram-pingpong.js

@@ -60,7 +60,7 @@ function pingPongTest(port, host) {
     var buf = new Buffer('PING'),
         client = dgram.createSocket('udp4');
 
-    client.addListener('message', function(msg, rinfo) {
+    client.on('message', function(msg, rinfo) {
       console.log('client got: ' + msg +
                   ' from ' + rinfo.address + ':' + rinfo.port);
       assert.equal('PONG', msg.toString('ascii'));
@@ -108,7 +108,7 @@ pingPongTest(20990, 'localhost');
 pingPongTest(20988);
 //pingPongTest('/tmp/pingpong.sock');
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(3, tests_run);
   console.log('done');
 });

test/simple/test-eio-race.js

@@ -80,6 +80,6 @@ fs.open('/dev/zero', 'r', 0666, function(err, fd) {
 
 tryToKillEventLoop();
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(pos > 10000);
 });

test/simple/test-eio-race4.js

@@ -37,6 +37,6 @@ for (var i = 0; i < N; i++) {
   });
 }
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(N, j);
 });

test/simple/test-error-reporting.js

@@ -71,6 +71,6 @@ errExec('throws_error3.js', function(err, stdout, stderr) {
 });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(3, exits);
 });

test/simple/test-eval.js

@@ -43,7 +43,7 @@ var child = exec(cmd, function(err, stdout, stderr) {
   ++success_count;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, success_count);
   assert.equal(0, error_count);
 });

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

@@ -28,7 +28,7 @@ var e = new events.EventEmitter();
 var events_new_listener_emited = [];
 var times_hello_emited = 0;
 
-e.addListener('newListener', function(event, listener) {
+e.on('newListener', function(event, listener) {
   console.log('newListener: ' + event);
   events_new_listener_emited.push(event);
 });
@@ -50,7 +50,7 @@ var f = new events.EventEmitter();
 f.setMaxListeners(0);
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.deepEqual(['hello'], events_new_listener_emited);
   assert.equal(1, times_hello_emited);
 });

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

@@ -29,8 +29,8 @@ var e = new events.EventEmitter();
 
 function callback1() {
   callbacks_called.push('callback1');
-  e.addListener('foo', callback2);
+  e.on('foo', callback2);
-  e.addListener('foo', callback3);
+  e.on('foo', callback3);
   e.removeListener('foo', callback1);
 }
 
@@ -44,7 +44,7 @@ function callback3() {
   e.removeListener('foo', callback3);
 }
 
-e.addListener('foo', callback1);
+e.on('foo', callback1);
 assert.equal(1, e.listeners('foo').length);
 
 e.emit('foo');
@@ -59,8 +59,8 @@ e.emit('foo');
 assert.equal(0, e.listeners('foo').length);
 assert.deepEqual(['callback1', 'callback2', 'callback3'], callbacks_called);
 
-e.addListener('foo', callback1);
+e.on('foo', callback1);
-e.addListener('foo', callback2);
+e.on('foo', callback2);
 assert.equal(2, e.listeners('foo').length);
 e.removeAllListeners('foo');
 assert.equal(0, e.listeners('foo').length);
@@ -69,8 +69,8 @@ assert.equal(0, e.listeners('foo').length);
 // all listeners
 callbacks_called = [];
 
-e.addListener('foo', callback2);
+e.on('foo', callback2);
-e.addListener('foo', callback3);
+e.on('foo', callback3);
 assert.equal(2, e.listeners('foo').length);
 e.emit('foo');
 assert.deepEqual(['callback2', 'callback3'], callbacks_called);

test/simple/test-event-emitter-num-args.js

@@ -41,7 +41,7 @@ e.emit('numArgs', null, null, null);
 e.emit('numArgs', null, null, null, null);
 e.emit('numArgs', null, null, null, null, null);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.deepEqual([0, 1, 2, 3, 4, 5], num_args_emited);
 });
 

test/simple/test-event-emitter-once.js

@@ -43,7 +43,7 @@ e.once('foo', remove);
 e.removeListener('foo', remove);
 e.emit('foo');
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, times_hello_emited);
 });
 

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

@@ -27,16 +27,16 @@ var events = require('events');
 function listener() {}
 
 var e1 = new events.EventEmitter();
-e1.addListener('foo', listener);
+e1.on('foo', listener);
-e1.addListener('bar', listener);
+e1.on('bar', listener);
 e1.removeAllListeners('foo');
 assert.deepEqual([], e1.listeners('foo'));
 assert.deepEqual([listener], e1.listeners('bar'));
 
 
 var e2 = new events.EventEmitter();
-e2.addListener('foo', listener);
+e2.on('foo', listener);
-e2.addListener('bar', listener);
+e2.on('bar', listener);
 e2.removeAllListeners();
 console.error(e2);
 assert.deepEqual([], e2.listeners('foo'));

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

@@ -42,18 +42,18 @@ function listener3() {
 }
 
 var e1 = new events.EventEmitter();
-e1.addListener('hello', listener1);
+e1.on('hello', listener1);
 e1.removeListener('hello', listener1);
 assert.deepEqual([], e1.listeners('hello'));
 
 var e2 = new events.EventEmitter();
-e2.addListener('hello', listener1);
+e2.on('hello', listener1);
 e2.removeListener('hello', listener2);
 assert.deepEqual([listener1], e2.listeners('hello'));
 
 var e3 = new events.EventEmitter();
-e3.addListener('hello', listener1);
+e3.on('hello', listener1);
-e3.addListener('hello', listener2);
+e3.on('hello', listener2);
 e3.removeListener('hello', listener1);
 assert.deepEqual([listener2], e3.listeners('hello'));
 

test/simple/test-exception-handler.js

@@ -25,13 +25,13 @@ var assert = require('assert');
 var MESSAGE = 'catch me if you can';
 var caughtException = false;
 
-process.addListener('uncaughtException', function(e) {
+process.on('uncaughtException', function(e) {
   console.log('uncaught exception! 1');
   assert.equal(MESSAGE, e.message);
   caughtException = true;
 });
 
-process.addListener('uncaughtException', function(e) {
+process.on('uncaughtException', function(e) {
   console.log('uncaught exception! 2');
   assert.equal(MESSAGE, e.message);
   caughtException = true;
@@ -41,7 +41,7 @@ setTimeout(function() {
   throw new Error(MESSAGE);
 }, 10);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   console.log('exit');
   assert.equal(true, caughtException);
 });

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

@@ -36,7 +36,7 @@ fs.readFile(filename, 'raw', function(err, content) {
   }
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   console.log('done');
   assert.equal(true, got_error);
 });

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

@@ -37,14 +37,14 @@ var path = require('path'),
     };
 
 file
-  .addListener('open', function(fd) {
+  .on('open', function(fd) {
       callbacks.open++;
       assert.equal('number', typeof fd);
     })
-  .addListener('error', function(err) {
+  .on('error', function(err) {
       throw err;
     })
-  .addListener('drain', function() {
+  .on('drain', function() {
       callbacks.drain++;
       if (callbacks.drain == -1) {
         assert.equal(EXPECTED, fs.readFileSync(fn));
@@ -57,7 +57,7 @@ file
         });
       }
     })
-  .addListener('close', function() {
+  .on('close', function() {
       assert.strictEqual(file.bytesWritten, EXPECTED.length * 2);
 
       callbacks.close++;
@@ -74,7 +74,7 @@ for (var i = 0; i < 11; i++) {
   })(i);
 }
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   for (var k in callbacks) {
     assert.equal(0, callbacks[k], k + ' count off by ' + callbacks[k]);
   }

test/simple/test-fs-chmod.js

@@ -91,7 +91,7 @@ fs.open(file, 'a', function(err, fd) {
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(2, success_count);
   assert.equal(false, got_error);
 });

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

@@ -182,7 +182,7 @@ try {
   assert.ok(0 <= err.message.indexOf(fn));
 }
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(expected, errors.length,
                'Test fs sync exceptions raised, got ' + errors.length +
                ' expected ' + expected);

test/simple/test-fs-fsync.js

@@ -54,6 +54,6 @@ fs.open(file, 'a', 0777, function(err, fd) {
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(4, successes);
 });

test/simple/test-fs-open.js

@@ -45,7 +45,7 @@ fs.open(__filename, 'r', function(err, fd) {
   openFd = fd;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(openFd);
 });
 

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

@@ -45,6 +45,6 @@ var r = fs.readSync(fd, bufferSync, 0, expected.length, 0);
 assert.deepEqual(bufferSync, new Buffer(expected));
 assert.equal(r, expected.length);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(readCalled, 1);
 });

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

@@ -40,7 +40,7 @@ var paused = false;
 
 var file = fs.ReadStream(fn);
 
-file.addListener('open', function(fd) {
+file.on('open', function(fd) {
   file.length = 0;
   callbacks.open++;
   assert.equal('number', typeof fd);
@@ -53,7 +53,7 @@ file.addListener('open', function(fd) {
   file.resume();
 });
 
-file.addListener('data', function(data) {
+file.on('data', function(data) {
   assert.ok(data instanceof Buffer);
   assert.ok(!paused);
   file.length += data.length;
@@ -70,12 +70,12 @@ file.addListener('data', function(data) {
 });
 
 
-file.addListener('end', function(chunk) {
+file.on('end', function(chunk) {
   callbacks.end++;
 });
 
 
-file.addListener('close', function() {
+file.on('close', function() {
   callbacks.close++;
   assert.ok(!file.readable);
 
@@ -90,7 +90,7 @@ file2.destroy(function(err) {
 
 var file3 = fs.createReadStream(fn, {encoding: 'utf8'});
 file3.length = 0;
-file3.addListener('data', function(data) {
+file3.on('data', function(data) {
   assert.equal('string', typeof(data));
   file3.length += data.length;
 
@@ -100,11 +100,11 @@ file3.addListener('data', function(data) {
   }
 });
 
-file3.addListener('close', function() {
+file3.on('close', function() {
   callbacks.close++;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, callbacks.open);
   assert.equal(1, callbacks.end);
   assert.equal(1, callbacks.destroy);
@@ -117,19 +117,19 @@ process.addListener('exit', function() {
 
 var file4 = fs.createReadStream(rangeFile, {bufferSize: 1, start: 1, end: 2});
 var contentRead = '';
-file4.addListener('data', function(data) {
+file4.on('data', function(data) {
   contentRead += data.toString('utf-8');
 });
-file4.addListener('end', function(data) {
+file4.on('end', function(data) {
   assert.equal(contentRead, 'yz');
 });
 
 var file5 = fs.createReadStream(rangeFile, {bufferSize: 1, start: 1});
 file5.data = '';
-file5.addListener('data', function(data) {
+file5.on('data', function(data) {
   file5.data += data.toString('utf-8');
 });
-file5.addListener('end', function() {
+file5.on('end', function() {
   assert.equal(file5.data, 'yz\n');
 });
 

test/simple/test-fs-read.js

@@ -43,6 +43,6 @@ var r = fs.readSync(fd, expected.length, 0, 'utf-8');
 assert.equal(r[0], expected);
 assert.equal(r[1], expected.length);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(readCalled, 1);
 });

test/simple/test-fs-realpath.js

@@ -459,7 +459,7 @@ fs.realpath('/', function(err, result) {
 
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   unlink.forEach(function(path) { try {fs.unlinkSync(path);} catch (e) {} });
   assert.equal(async_completed, async_expected);
 });

test/simple/test-fs-stat.js

@@ -114,7 +114,7 @@ fs.stat(__filename, function(err, s) {
   }
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(5, success_count);
   assert.equal(false, got_error);
 });

test/simple/test-fs-symlink.js

@@ -54,7 +54,7 @@ fs.link(srcPath, dstPath, function(err) {
   completed++;
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(completed, 2);
 });
 

test/simple/test-fs-watch.js

@@ -45,7 +45,7 @@ var testsubdir = path.join(testDir, 'testsubdir');
 var filepathThree = path.join(testsubdir, filenameThree);
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   fs.unlinkSync(filepathOne);
   fs.unlinkSync(filepathTwoAbs);
   fs.unlinkSync(filepathThree);

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

@@ -47,7 +47,7 @@ fs.open(filename, 'w', 0644, function(err, fd) {
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(1, openCalled);
   assert.equal(1, writeCalled);
 });

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

@@ -91,7 +91,7 @@ fs.writeFile(filename3, n, function(e) {
 });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   common.error('done');
   assert.equal(6, ncallbacks);
 

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

@@ -41,7 +41,7 @@ var file = path.join(common.tmpDir, 'write.txt');
 (function() {
   var stream = fs.createWriteStream(file);
 
-  stream.addListener('drain', function() {
+  stream.on('drain', function() {
     assert.fail('\'drain\' event must not be emitted before ' +
                 'stream.write() has been called at least once.');
   });

test/simple/test-fs-write.js

@@ -69,7 +69,7 @@ fs.open(fn2, constants.O_CREAT | constants.O_WRONLY | constants.O_TRUNC, 0644,
     });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(expected, found);
   assert.equal(expected, found2);
 });

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

@@ -42,7 +42,7 @@ var server = http.createServer(function(req, res) {
 server.listen(common.PORT, function() {
   var c = net.createConnection(common.PORT);
 
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     common.error('client wrote message');
     c.write('GET /blah HTTP/1.1\r\n' +
             'Host: mapdevel.trolologames.ru:443\r\n' +
@@ -52,17 +52,17 @@ server.listen(common.PORT, function() {
     );
   });
 
-  c.addListener('end', function() {
+  c.on('end', function() {
     c.end();
   });
 
-  c.addListener('close', function() {
+  c.on('close', function() {
     common.error('client close');
     server.close();
   });
 });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(gotReq);
 });

test/simple/test-http-client-parse-error.js

@@ -31,7 +31,7 @@ var srv = net.createServer(function(c) {
 
   console.log('connection');
 
-  c.addListener('end', function() { c.end(); });
+  c.on('end', function() { c.end(); });
 });
 
 var parseError = false;
@@ -53,7 +53,7 @@ srv.listen(common.PORT, '127.0.0.1', function() {
 });
 
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(parseError);
 });
 

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

@@ -53,7 +53,7 @@ var body1 = '';
 var body2 = '';
 var body3 = '';
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var client = http.createClient(common.PORT);
 
   //
@@ -61,14 +61,14 @@ server.addListener('listening', function() {
   //
   var req1 = client.request('/1');
   req1.end();
-  req1.addListener('response', function(res1) {
+  req1.on('response', function(res1) {
     res1.setEncoding('utf8');
 
-    res1.addListener('data', function(chunk) {
+    res1.on('data', function(chunk) {
       body1 += chunk;
     });
 
-    res1.addListener('end', function() {
+    res1.on('end', function() {
       //
       // Delay execution a little to allow the 'close' event to be processed
       // (required to trigger this bug!)
@@ -87,10 +87,10 @@ server.addListener('listening', function() {
         //
         var req2 = client.request('/2');
         req2.end();
-        req2.addListener('response', function(res2) {
+        req2.on('response', function(res2) {
           res2.setEncoding('utf8');
-          res2.addListener('data', function(chunk) { body2 += chunk; });
+          res2.on('data', function(chunk) { body2 += chunk; });
-          res2.addListener('end', function() {
+          res2.on('end', function() {
 
             //
             // Just to be really sure we've covered all our bases, execute a
@@ -98,10 +98,10 @@ server.addListener('listening', function() {
             //
             var req3 = client2.request('/3');
             req3.end();
-            req3.addListener('response', function(res3) {
+            req3.on('response', function(res3) {
               res3.setEncoding('utf8');
-              res3.addListener('data', function(chunk) { body3 += chunk });
+              res3.on('data', function(chunk) { body3 += chunk });
-              res3.addListener('end', function() { server.close(); });
+              res3.on('end', function() { server.close(); });
             });
           });
         });
@@ -110,7 +110,7 @@ server.addListener('listening', function() {
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(body1_s, body1);
   assert.equal(body2_s, body2);
   assert.equal(body3_s, body3);

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

@@ -38,29 +38,29 @@ server.listen(common.PORT);
 var body1 = '';
 var body2 = '';
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var req1 = http.request({ port: common.PORT, path: '/1' });
   req1.end();
-  req1.addListener('response', function(res1) {
+  req1.on('response', function(res1) {
     res1.setEncoding('utf8');
 
-    res1.addListener('data', function(chunk) {
+    res1.on('data', function(chunk) {
       body1 += chunk;
     });
 
-    res1.addListener('end', function() {
+    res1.on('end', function() {
       var req2 = http.request({ port: common.PORT, path: '/2' });
       req2.end();
-      req2.addListener('response', function(res2) {
+      req2.on('response', function(res2) {
         res2.setEncoding('utf8');
-        res2.addListener('data', function(chunk) { body2 += chunk; });
+        res2.on('data', function(chunk) { body2 += chunk; });
-        res2.addListener('end', function() { server.close(); });
+        res2.on('end', function() { server.close(); });
       });
     });
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(body1_s, body1);
   assert.equal(body2_s, body2);
 });

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

@@ -31,11 +31,11 @@ var client_res_complete = false;
 var server = http.createServer(function(req, res) {
   assert.equal('POST', req.method);
 
-  req.addListener('data', function(chunk) {
+  req.on('data', function(chunk) {
     bytesRecieved += chunk.length;
   });
 
-  req.addListener('end', function() {
+  req.on('end', function() {
     server_req_complete = true;
     console.log('request complete from server');
     res.writeHead(200, {'Content-Type': 'text/plain'});
@@ -45,17 +45,17 @@ var server = http.createServer(function(req, res) {
 });
 server.listen(common.PORT);
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var req = http.request({
     port: common.PORT,
     method: 'POST',
     path: '/'
   }, function(res) {
     res.setEncoding('utf8');
-    res.addListener('data', function(chunk) {
+    res.on('data', function(chunk) {
       console.log(chunk);
     });
-    res.addListener('end', function() {
+    res.on('end', function() {
       client_res_complete = true;
       server.close();
     });
@@ -67,7 +67,7 @@ server.addListener('listening', function() {
   common.error('client finished sending request');
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(N, bytesRecieved);
   assert.equal(true, server_req_complete);
   assert.equal(true, client_res_complete);

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

@@ -31,12 +31,12 @@ var server = http.createServer(function(req, res) {
   assert.equal('POST', req.method);
   req.setEncoding('utf8');
 
-  req.addListener('data', function(chunk) {
+  req.on('data', function(chunk) {
     console.log('server got: ' + JSON.stringify(chunk));
     sent_body += chunk;
   });
 
-  req.addListener('end', function() {
+  req.on('end', function() {
     server_req_complete = true;
     console.log('request complete from server');
     res.writeHead(200, {'Content-Type': 'text/plain'});
@@ -46,17 +46,17 @@ var server = http.createServer(function(req, res) {
 });
 server.listen(common.PORT);
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var req = http.request({
     port: common.PORT,
     method: 'POST',
     path: '/'
   }, function(res) {
     res.setEncoding('utf8');
-    res.addListener('data', function(chunk) {
+    res.on('data', function(chunk) {
       console.log(chunk);
     });
-    res.addListener('end', function() {
+    res.on('end', function() {
       client_res_complete = true;
       server.close();
     });
@@ -70,7 +70,7 @@ server.addListener('listening', function() {
   common.error('client finished sending request');
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal('1\n2\n3\n', sent_body);
   assert.equal(true, server_req_complete);
   assert.equal(true, client_res_complete);

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

@@ -31,10 +31,10 @@ var http = require('http');
 var server = http.createServer(function(req, res) {});
 server.listen(common.PORT);
 
-server.addListener('listening', function() {
+server.on('listening', function() {
-  net.createConnection(common.PORT).addListener('connect', function() {
+  net.createConnection(common.PORT).on('connect', function() {
     this.destroy();
-  }).addListener('close', function() {
+  }).on('close', function() {
     server.close();
   });
 });

test/simple/test-http-exceptions.js

@@ -39,7 +39,7 @@ server.listen(common.PORT, function() {
 
 var exception_count = 0;
 
-process.addListener('uncaughtException', function(err) {
+process.on('uncaughtException', function(err) {
   console.log('Caught an exception: ' + err);
   if (err.name === 'AssertionError') throw err;
   if (++exception_count == 4) process.exit(0);

test/simple/test-http-expect-continue.js

@@ -40,7 +40,7 @@ function handler(req, res) {
 }
 
 var server = http.createServer(handler);
-server.addListener('checkContinue', function(req, res) {
+server.on('checkContinue', function(req, res) {
   common.debug('Server got Expect: 100-continue...');
   res.writeContinue();
   sent_continue = true;
@@ -50,7 +50,7 @@ server.listen(common.PORT);
 
 
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var req = http.request({
     port: common.PORT,
     method: 'POST',
@@ -60,19 +60,19 @@ server.addListener('listening', function() {
   common.debug('Client sending request...');
   outstanding_reqs++;
   var body = '';
-  req.addListener('continue', function() {
+  req.on('continue', function() {
     common.debug('Client got 100 Continue...');
     got_continue = true;
     req.end(test_req_body);
   });
-  req.addListener('response', function(res) {
+  req.on('response', function(res) {
     assert.equal(got_continue, true,
                  'Full response received before 100 Continue');
     assert.equal(200, res.statusCode,
                  'Final status code was ' + res.statusCode + ', not 200.');
     res.setEncoding('utf8');
-    res.addListener('data', function(chunk) { body += chunk; });
+    res.on('data', function(chunk) { body += chunk; });
-    res.addListener('end', function() {
+    res.on('end', function() {
       common.debug('Got full response.');
       assert.equal(body, test_res_body, 'Response body doesn\'t match.');
       assert.ok('abcd' in res.headers, 'Response headers missing.');

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

@@ -91,6 +91,6 @@ server.listen(common.PORT, function() {
 
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(3, runs);
 });

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

@@ -43,7 +43,7 @@ server.listen(common.PORT, function() {
     path: '/'
   }, function(response) {
     common.error('response start');
-    response.addListener('end', function() {
+    response.on('end', function() {
       common.error('response end');
       gotEnd = true;
     });
@@ -51,6 +51,6 @@ server.listen(common.PORT, function() {
   request.end();
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(gotEnd);
 });

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

@@ -39,14 +39,14 @@ server.listen(common.PORT);
 
 var responseComplete = false;
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var req = http.request({
     port: common.PORT,
     method: 'HEAD',
     path: '/'
   }, function(res) {
     common.error('response');
-    res.addListener('end', function() {
+    res.on('end', function() {
       common.error('response end');
       server.close();
       responseComplete = true;
@@ -56,6 +56,6 @@ server.addListener('listening', function() {
   req.end();
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(responseComplete);
 });

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

@@ -36,14 +36,14 @@ server.listen(common.PORT);
 
 var responseComplete = false;
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var req = http.request({
     port: common.PORT,
     method: 'HEAD',
     path: '/'
   }, function(res) {
     common.error('response');
-    res.addListener('end', function() {
+    res.on('end', function() {
       common.error('response end');
       server.close();
       responseComplete = true;
@@ -53,6 +53,6 @@ server.addListener('listening', function() {
   req.end();
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.ok(responseComplete);
 });

test/simple/test-http-keep-alive-close-on-header.js

@@ -76,7 +76,7 @@ server.listen(common.PORT, function() {
     port: common.PORT,
     agent: agent
   }, function(response) {
-    response.addListener('end', function() {
+    response.on('end', function() {
       assert.equal(1, agent.sockets['localhost:' + common.PORT].length);
       server.close();
     });
@@ -89,6 +89,6 @@ server.listen(common.PORT, function() {
   request.end();
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(3, connectCount);
 });

test/simple/test-http-keep-alive.js

@@ -47,7 +47,7 @@ server.listen(common.PORT, function() {
   });
   request.end();
   request = http.request({method: 'GET', path: '/', headers: headers, port: common.PORT, agent: agent}, function(response) {
-    response.addListener('end', function() {
+    response.on('end', function() {
       assert.equal(1, agent.sockets['localhost:' + common.PORT].length);
       server.close();
     });

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

@@ -42,9 +42,9 @@ var server = http.createServer(function(req, res) {
 });
 server.listen(common.PORT);
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var c = net.createConnection(common.PORT);
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     c.write('GET /hello?foo=%99bar HTTP/1.1\r\n\r\n');
     c.end();
   });
@@ -52,6 +52,6 @@ server.addListener('listening', function() {
   // TODO add more!
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(nrequests_expected, nrequests_completed);
 });

test/simple/test-http-proxy.js

@@ -58,11 +58,11 @@ var proxy = http.createServer(function(req, res) {
 
     res.writeHead(proxy_res.statusCode, proxy_res.headers);
 
-    proxy_res.addListener('data', function(chunk) {
+    proxy_res.on('data', function(chunk) {
       res.write(chunk);
     });
 
-    proxy_res.addListener('end', function() {
+    proxy_res.on('end', function() {
       res.end();
       common.debug('proxy res');
     });
@@ -88,8 +88,8 @@ function startReq() {
     assert.deepEqual(cookies, res.headers['set-cookie']);
 
     res.setEncoding('utf8');
-    res.addListener('data', function(chunk) { body += chunk; });
+    res.on('data', function(chunk) { body += chunk; });
-    res.addListener('end', function() {
+    res.on('end', function() {
       proxy.close();
       backend.close();
       common.debug('closed both');
@@ -104,6 +104,6 @@ proxy.listen(PROXY_PORT, startReq);
 common.debug('listen backend');
 backend.listen(BACKEND_PORT, startReq);
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(body, 'hello world\n');
 });

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

@@ -36,7 +36,7 @@ var server = http.createServer(function(req, res) {
 });
 server.listen(common.PORT);
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   console.error('make req');
   http.get({
     port: common.PORT

test/simple/test-http-server.js

@@ -71,17 +71,17 @@ server.listen(common.PORT);
 
 server.httpAllowHalfOpen = true;
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   var c = net.createConnection(common.PORT);
 
   c.setEncoding('utf8');
 
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     c.write('GET /hello?hello=world&foo=b==ar HTTP/1.1\r\n\r\n');
     requests_sent += 1;
   });
 
-  c.addListener('data', function(chunk) {
+  c.on('data', function(chunk) {
     server_response += chunk;
 
     if (requests_sent == 1) {
@@ -105,16 +105,16 @@ server.addListener('listening', function() {
 
   });
 
-  c.addListener('end', function() {
+  c.on('end', function() {
     client_got_eof = true;
   });
 
-  c.addListener('close', function() {
+  c.on('close', function() {
     assert.equal(c.readyState, 'closed');
   });
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(4, request_number);
   assert.equal(4, requests_sent);
 

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

@@ -39,7 +39,7 @@ var server = http.createServer(function(req, res) {
 });
 server.listen(common.PORT);
 
-server.addListener('listening', function() {
+server.on('listening', function() {
   //
   // one set-cookie header
   //
@@ -49,11 +49,11 @@ server.addListener('listening', function() {
     assert.deepEqual(['A'], res.headers['set-cookie']);
     assert.equal('text/plain', res.headers['content-type']);
 
-    res.addListener('data', function(chunk) {
+    res.on('data', function(chunk) {
       console.log(chunk.toString());
     });
 
-    res.addListener('end', function() {
+    res.on('end', function() {
       if (++nresponses == 2) {
         server.close();
       }
@@ -66,11 +66,11 @@ server.addListener('listening', function() {
     assert.deepEqual(['A', 'B'], res.headers['set-cookie']);
     assert.equal('text/plain', res.headers['content-type']);
 
-    res.addListener('data', function(chunk) {
+    res.on('data', function(chunk) {
       console.log(chunk.toString());
     });
 
-    res.addListener('end', function() {
+    res.on('end', function() {
       if (++nresponses == 2) {
         server.close();
       }
@@ -79,6 +79,6 @@ server.addListener('listening', function() {
 
 });
 
-process.addListener('exit', function() {
+process.on('exit', function() {
   assert.equal(2, nresponses);
 });

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

@@ -27,7 +27,7 @@ var server = http.createServer(function(req, res) {
   console.log('got request. setting 1 second timeout');
   req.connection.setTimeout(500);
 
-  req.connection.addListener('timeout', function() {
+  req.connection.on('timeout', function() {
     req.connection.destroy();
     common.debug('TIMEOUT');
     server.close();

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

@@ -35,23 +35,23 @@ server.listen(common.PORT);
 
 
 // first, we test an HTTP/1.0 request.
-server.addListener('listening', function() {
+server.on('listening', function() {
   var c = net.createConnection(common.PORT);
   var res_buffer = '';
 
   c.setEncoding('utf8');
 
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     outstanding_reqs++;
     c.write('GET / HTTP/1.0\r\n\r\n');
   });
 
-  c.addListener('data', function(chunk) {
+  c.on('data', function(chunk) {
     //console.log(chunk);
     res_buffer += chunk;
   });
 
-  c.addListener('end', function() {
+  c.on('end', function() {
     c.end();
     assert.ok(! /x-foo/.test(res_buffer), 'Trailer in HTTP/1.0 response.');
     outstanding_reqs--;
@@ -63,20 +63,20 @@ server.addListener('listening', function() {
 });
 
 // now, we test an HTTP/1.1 request.
-server.addListener('listening', function() {
+server.on('listening', function() {
   var c = net.createConnection(common.PORT);
   var res_buffer = '';
   var tid;
 
   c.setEncoding('utf8');
 
-  c.addListener('connect', function() {
+  c.on('connect', function() {
     outstanding_reqs++;
     c.write('GET / HTTP/1.1\r\n\r\n');
     tid = setTimeout(assert.fail, 2000, 'Couldn\'t find last chunk.');
   });
 
-  c.addListener('data', function(chunk) {
+  c.on('data', function(chunk) {
     //console.log(chunk);
     res_buffer += chunk;
     if (/0\r\n/.test(res_buffer)) { // got the end.
@@ -95,9 +95,9 @@ server.addListener('listening', function() {
 });
 
 // now, see if the client sees the trailers.
-server.addListener('listening', function() {
+server.on('listening', function() {
   http.get({ port: common.PORT, path: '/hello', headers: {} }, function(res) {
-    res.addListener('end', function() {
+    res.on('end', function() {
       //console.log(res.trailers);
       assert.ok('x-foo' in res.trailers, 'Client doesn\'t see trailers.');
       outstanding_reqs--;