p71924506
/
cylon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to stop drivers, then adaptors

This commit is contained in:
Andrew Stewart 2014-09-04 10:18:18 -07:00
parent 8f20ccbcf3
commit d2b00c7d30
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/robot.js
View File

@ -292,12 +292,16 @@ Robot.prototype.halt = function(callback) {
fns.push(device.halt.bind(device)); fns.push(device.halt.bind(device));
} }
Async.parallel(fns, function() {
var fns = [];
for (var c in this.connections) { for (var c in this.connections) {
var connection = this.connections[c]; var connection = this.connections[c];
fns.push(connection.disconnect.bind(connection)); fns.push(connection.disconnect.bind(connection));
} }
Async.parallel(fns, callback); Async.parallel(fns, callback);
}.bind(this));
}; };
// Public: Initialize an adaptor and adds it to @robot.adaptors // Public: Initialize an adaptor and adds it to @robot.adaptors
@ -323,6 +327,7 @@ Robot.prototype.initAdaptor = function(adaptorName, connection, opts) {
connection: connection, connection: connection,
extraParams: opts extraParams: opts
}); });
return Utils.proxyTestStubs(adaptor.commands, testAdaptor); return Utils.proxyTestStubs(adaptor.commands, testAdaptor);
for (var prop in adaptor) { for (var prop in adaptor) {

4
test/specs/robot.spec.js
View File

@ -348,8 +348,8 @@ describe("Robot", function() {
device = bot.devices.ping; device = bot.devices.ping;
connection = bot.connections.loopback; connection = bot.connections.loopback;
stub(device, 'halt').returns(true); stub(device, 'halt').yields(true);
stub(connection, 'disconnect').returns(true); stub(connection, 'disconnect').yields(true);
}); });
afterEach(function() { afterEach(function() {