Merge pull request #42 from 86chenjie/master

fix exception
bcoe · Nov 5, 2014 · 483217f · 483217f
2 parents 0c97209 + 6f1460a
commit 483217f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/script.js b/lib/script.js
@@ -111,7 +111,7 @@ Script.prototype._parseChunk = function(data) {
   try {
     if (data.toString() !== 'undefined') {
         output = JSON.parse(data);
-        if (output.error) {
+        if (output !== null && output.error) {
             error = new Error(output.error.message);
             error.stack = output.error.stack;
             output = null;

diff --git a/test/sandcastle-test.js b/test/sandcastle-test.js
@@ -84,6 +84,24 @@ describe('SandCastle', function () {
 
     script.run();
   });
+
+  it('should able to exit(null)', function (finished) {
+    var sandcastle = new SandCastle();
+
+    var script = sandcastle.createScript("\
+      exports.main = function() {\
+        exit(null);\
+      }\
+    ");
+
+    script.on('exit', function (err, result) {
+      sandcastle.kill();
+	  equal(result,null);
+      finished();
+    });
+
+    script.run();
+  });
 
   it('should provide an API', function (finished) {
     var sandcastle = new SandCastle({