From 67f0386bb58ffcbc523155094f1efa6f41f3deeb Mon Sep 17 00:00:00 2001
From: Andrew Stewart <andrew@stwrt.ca>
Date: Tue, 21 Jul 2015 10:31:52 -0700
Subject: [PATCH] prevent callback(err) from messing with shutdown

---
 lib/robot.js           |  9 +++++++--
 spec/lib/robot.spec.js | 41 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/lib/robot.js b/lib/robot.js
index d578db7..b5f5203 100644
--- a/lib/robot.js
+++ b/lib/robot.js
@@ -346,8 +346,13 @@ Robot.prototype.halt = function(callback) {
     return callback();
   }
 
-  var devices = _.pluck(this.devices, "halt"),
-      connections = _.pluck(this.connections, "disconnect");
+  // ensures callback(err) won't prevent others from halting
+  function wrap(fn) {
+    return function(cb) { fn.call(null, cb.bind(null, null)); };
+  }
+
+  var devices = _.pluck(this.devices, "halt").map(wrap),
+      connections = _.pluck(this.connections, "disconnect").map(wrap);
 
   try {
     _.parallel(devices, function() {
diff --git a/spec/lib/robot.spec.js b/spec/lib/robot.spec.js
index 60cd98b..972d342 100644
--- a/spec/lib/robot.spec.js
+++ b/spec/lib/robot.spec.js
@@ -463,13 +463,8 @@ describe("Robot", function() {
       device = bot.devices.ping;
       connection = bot.connections.loopback;
 
-      stub(device, "halt").yields(true);
-      stub(connection, "disconnect").yields(true);
-    });
-
-    afterEach(function() {
-      device.halt.restore();
-      connection.disconnect.restore();
+      stub(device, "halt").yields();
+      stub(connection, "disconnect").yields();
     });
 
     it("calls #halt on all devices and connections", function() {
@@ -478,6 +473,38 @@ describe("Robot", function() {
       expect(device.halt).to.be.called;
       expect(connection.disconnect).to.be.called;
     });
+
+    context("if a subcall triggers it's callback with an error", function() {
+      beforeEach(function() {
+        bot = new Robot({
+          devices: {
+            ping: { driver: "ping" },
+            ping2: { driver: "ping" }
+          },
+
+          connections: {
+            loopback: { adaptor: "loopback" },
+            loopback2: { adaptor: "loopback" }
+          }
+        });
+
+        bot.running = true;
+
+        stub(bot.devices.ping, "halt").yields("error!");
+        stub(bot.devices.ping2, "halt").yields();
+        stub(bot.connections.loopback, "disconnect").yields("another err!");
+        stub(bot.connections.loopback2, "disconnect").yields();
+      });
+
+      it("doesn't effect the rest of the shutdown", function() {
+        bot.halt();
+
+        expect(bot.devices.ping.halt).to.be.called;
+        expect(bot.devices.ping2.halt).to.be.called;
+        expect(bot.connections.loopback.disconnect).to.be.called;
+        expect(bot.connections.loopback2.disconnect).to.be.called;
+      });
+    });
   });
 
   describe("#toString", function() {