Fix: Change & tests for failing child processes (fixes #24)

tunnckoCore · phated · commit 0224d42dd050 · 2016-05-17T13:56:26.000-07:00
diff --git a/index.js b/index.js
@@ -40,7 +40,7 @@ function asyncDone(fn, cb){
     if(result && typeof result.on === 'function'){
       // assume node stream
       d.add(result);
-      eos(exhaust(result), eosConfig, onSuccess);
+      eos(exhaust(result), eosConfig, done);
       return;
     }
 
diff --git a/test/child_processes.js b/test/child_processes.js
@@ -0,0 +1,56 @@
+'use strict';
+
+var lab = exports.lab = require('lab').script();
+var describe = lab.describe;
+var it = lab.it;
+var expect = require('code').expect;
+
+var cp = require('child_process');
+var asyncDone = require('../');
+
+
+function execSuccess(){
+  return cp.exec('echo hello world');
+}
+
+function execFail(){
+  return cp.exec('foo-bar-baz hello world');
+}
+
+function spawnSuccess(){
+  return cp.spawn('echo', ['hello world']);
+}
+
+function spawnFail(){
+  return cp.spawn('foo-bar-baz', ['hello world']);
+}
+
+describe('child processes', function(){
+  it('should handle successful exec', function(done){
+    asyncDone(execSuccess, function(err){
+      expect(err).to.not.be.instanceof(Error);
+      done();
+    });
+  });
+
+  it('should handle failing exec', function(done){
+    asyncDone(execFail, function(err){
+      expect(err).to.be.an.instanceof(Error);
+      done();
+    });
+  });
+
+  it('should handle successful spawn', function(done){
+    asyncDone(spawnSuccess, function(err){
+      expect(err).to.not.be.instanceof(Error);
+      done();
+    });
+  });
+
+  it('should handle failing spawn', function(done){
+    asyncDone(spawnFail, function(err){
+      expect(err).to.be.an.instanceof(Error);
+      done();
+    });
+  });
+});
diff --git a/test/streams.js b/test/streams.js
@@ -37,19 +37,10 @@ function unpiped(){
   return fs.createReadStream(exists);
 }
 
-function exec(){
-  return cp.exec('echo hello world');
-}
-
-function spawn(){
-  return cp.spawn('echo', ['hello world']);
-}
-
 describe('streams', function(){
-
   it('should handle a successful stream', function(done){
     asyncDone(success, function(err){
-      expect(err).to.equal(null);
+      expect(err).to.not.be.instanceof(Error);
       done();
     });
   });
@@ -65,29 +56,15 @@ describe('streams', function(){
     asyncDone(function(cb){
       return success().on('end', function(){ cb(null, 3); });
     }, function(err, result){
-      expect(err).to.equal(null);
+      expect(err).to.not.be.instanceof(Error);
       expect(result).to.equal(3); // to know we called the callback
       done();
     });
   });
 
   it('consumes an unpiped readable stream', function(done){
     asyncDone(unpiped, function(err){
-      expect(err).to.equal(null);
-      done();
-    });
-  });
-
-  it('should handle exec', function(done){
-    asyncDone(exec, function(err){
-      expect(err).to.equal(null);
-      done();
-    });
-  });
-
-  it('should handle spawn', function(done){
-    asyncDone(spawn, function(err){
-      expect(err).to.equal(null);
+      expect(err).to.not.be.instanceof(Error);
       done();
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function asyncDone(fn, cb){`
`40`	`40`	`if(result && typeof result.on === 'function'){`
`41`	`41`	`// assume node stream`
`42`	`42`	`d.add(result);`
`43`		`- eos(exhaust(result), eosConfig, onSuccess);`
	`43`	`+ eos(exhaust(result), eosConfig, done);`
`44`	`44`	`return;`
`45`	`45`	`}`
`46`	`46`