Fixed bugs and updated tests. All tests should now pass.

Author: brucedjones

index.js

@@ -73,20 +73,38 @@ var PythonShell = function (script, options) {
         errorData += ''+data;
     });
 
-    this.childProcess.on('exit', function (code, signal) {
+    this.stderr.on('end', function(){
+        self.stderrHasEnded = true
+        terminateIfNeeded();
+    })
+
+    this.stdout.on('end', function(){
+        self.stdoutHasEnded = true
+        terminateIfNeeded();
+    })
+
+    this.childProcess.on('exit', function (code,signal) {
+        self.exitCode = code;
+        self.exitSignal = signal;
+        terminateIfNeeded();
+    });
+
+    function terminateIfNeeded() {
+        if(!self.stderrHasEnded || !self.stdoutHasEnded || (self.exitCode == null && self.exitSignal == null)) return;
+
         var err;
-        if (errorData || (code && code !== 0)) {
+        if (errorData || (self.exitCode && self.exitCode !== 0)) {
             if (errorData) {
                 err = self.parseError(errorData);
             } else {
-                err = new Error('process exited with code ' + code);
+                err = new Error('process exited with code ' + self.exitCode);
             }
             err = extend(err, {
                 executable: pythonPath,
                 options: pythonOptions.length ? pythonOptions : null,
                 script: self.script,
                 args: scriptArgs.length ? scriptArgs : null,
-                exitCode: code
+                exitCode: self.exitCode
             });
             // do not emit error if only a callback is used
             if (self.listeners('error').length || !self._endCallback) {
@@ -96,8 +114,8 @@ var PythonShell = function (script, options) {
 
         self.terminated = true;
         self.emit('close');
-        self._endCallback && self._endCallback(err,self.exitCode,signal);
-    });
+        self._endCallback && self._endCallback(err,self.exitCode,self.exitSignal);
+    };
 };
 util.inherits(PythonShell, EventEmitter);
 

test/test-python-shell.js

@@ -238,9 +238,9 @@ describe('PythonShell', function () {
     describe('.end(callback)', function () {
         it('should end normally when exit code is zero', function (done) {
             var pyshell = new PythonShell('exit-code.py');
-            pyshell.end(function (err) {
+            pyshell.end(function (err,code,signal) {
                 if (err) return done(err);
-                pyshell.exitCode.should.be.exactly(0);
+                code.should.be.exactly(0);
                 done();
             });
         });
@@ -292,7 +292,7 @@ describe('PythonShell', function () {
         it('set terminated to true', function (done) {
             var pyshell = new PythonShell('infinite_loop.py');
             pyshell.terminate();
-            pyshell.terminated.should.be.true;
+            pyshell.terminated.should.be.true
             done();
         });
         it('run the end callback if specified', function (done) {
@@ -302,7 +302,18 @@ describe('PythonShell', function () {
                 endCalled = true;
             })
             pyshell.terminate();
-            endCalled.should.be.true;
+            pyshell.terminated.should.be.true
+            done();
+        });
+        it('terminate with correct kill signal', function (done) {
+            var pyshell = new PythonShell('infinite_loop.py');
+            var endCalled = false;
+            pyshell.end(()=>{
+                endCalled = true;
+            })
+            pyshell.terminate('SIGKILL');
+            pyshell.terminated.should.be.true;
+            setTimeout(()=>{pyshell.exitSignal.should.be.exactly('SIGKILL');},500);
             done();
         });
     });