[api test minor] Be more liberal handling errors on stop.

nodejitsu · Mar 7, 2013 · f5203d7 · f5203d7
1 parent b09c66c
commit f5203d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/lib/haibu/drone/drone.js b/lib/haibu/drone/drone.js
@@ -158,7 +158,7 @@ Drone.prototype.stop = function (name, cleanup, callback) {
   }
 
   if (typeof this.apps[name] === 'undefined') {
-    return callback(new Error('Cannot stop application that is not running.'));
+    return callback();
   }
 
   var self = this,

diff --git a/lib/haibu/drone/service.js b/lib/haibu/drone/service.js
@@ -144,8 +144,7 @@ exports.createRouter = function (drone) {
       var res = this.res;
 
       drone.stop(this.req.body.stop.name, function (err, result) {
-        if (err || !result) {
+        if (err) {
-          err = err || new Error('Unknown error from drone.');
           haibu.emit('error:service', 'error', err);
           return haibu.sendResponse(res, 500, { error: err });
         }

diff --git a/test/drone/drone-api-test.js b/test/drone/drone-api-test.js
@@ -279,13 +279,8 @@ vows.describe('haibu/drone/api').addBatch(
 
           request(options, this.callback);
         },
-        "should respond with 500": function (error, response, body) {
+        "should respond with 200": function (error, response, body) {
-          assert.equal(response.statusCode, 500);
+          assert.equal(response.statusCode, 200);
-        },
-        "should respond with the appropriate error": function (error, response, body) {
-          var result = JSON.parse(body);
-          assert.isObject(result.error);
-          assert.equal(result.error.message, 'Cannot stop application that is not running.');
         }
       }
     }