test hardening

test/cli.js

@@ -15,7 +15,7 @@ var assert = require('assert'),
 describe('cli', function() {
   // For some reason we experience random timeout failures in CI
   // due to spawn hanging/failing silently. See #1692.
-  this.retries(4);
+  // this.retries(4);
 
   describe('node-sass < in.scss', function() {
     it('should read data from stdin', function(done) {
@@ -337,7 +337,7 @@ describe('cli', function() {
       ]);
 
       bin.stdout.setEncoding('utf8');
-      bin.stdout.once('data', function(data) {
+      bin.stdout.on('data', function(data) {
         assert.strictEqual(data.trim(), 'body{background:white}');
         bin.kill();
       });
@@ -383,7 +383,7 @@ describe('cli', function() {
       setTimeout(function() {
         touch.sync(srcFile);
       }, 500);
-    });
+    }).timeout(5000);
 
     it('should compile all changed files in watched directory', function(done) {
       var destDir = tmpDir({ create: true });
@@ -402,16 +402,18 @@ describe('cli', function() {
       });
       bin.on('error', assert.fail);
 
-
-      fs.watch(destDir, once(function() {
-        bin.kill();
-        fs.readdir(destDir, function(err, files) {
-          assert.deepEqual(files, ['foo.css', 'index.css']);
-          rimraf(destDir, done);
-        });
-      }));
-
       setTimeout(function() {
+        // Two output files are produced so fs.watch
+        // may fire or twice depending on environment.
+        // Using a timeout is more predictable but slower.
+        setTimeout(function() {
+          bin.kill();
+          fs.readdir(destDir, function(err, files) {
+            assert.deepEqual(files, ['foo.css', 'index.css']);
+            rimraf(destDir, done);
+          });
+        }, 1000);
+
         touch.sync(srcFile);
       }, 500);
     });