improve mocha tests (#2797)

- workaround sporadic delays from Travis CI

test/mocha.js

@@ -1,29 +1,24 @@
-var Mocha = require('mocha'),
+var fs = require("fs");
-    fs = require('fs'),
+var Mocha = require("mocha");
-    path = require('path');
+var path = require("path");
 
-// Instantiate a Mocha instance.
+// Instantiate a Mocha instance
-var mocha = new Mocha({});
+var mocha = new Mocha({
+    timeout: 5000
+});
+var testDir = __dirname + "/mocha/";
 
-var testDir = __dirname + '/mocha/';
+// Add each .js file to the Mocha instance
-
+fs.readdirSync(testDir).filter(function(file) {
-// Add each .js file to the mocha instance
+    return /\.js$/.test(file);
-fs.readdirSync(testDir).filter(function(file){
+}).forEach(function(file) {
-    // Only keep the .js files
+    mocha.addFile(path.join(testDir, file));
-    return file.substr(-3) === '.js';
-
-}).forEach(function(file){
-    mocha.addFile(
-        path.join(testDir, file)
-    );
 });
 
 module.exports = function() {
     mocha.run(function(failures) {
-        if (failures !== 0) {
+        if (failures) process.on("exit", function() {
-            process.on('exit', function () {
             process.exit(failures);
         });
-        }
     });
 };