starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-17 23:53:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #481 from openstf/add-automation-label

Browse Source 
Use automation label in device list for devices accessed using API
This commit is contained in:
Vishal Banthia
2016-11-25 03:59:20 +05:30
committed by GitHub
parent 12c4bb116d 68c9a6d883
commit 445cfcf0bc
15 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/units/device/plugins/group.js
View File

@@ -30,7 +30,7 @@ module.exports = syrup.serial()
return currentGroup
})
plugin.join = function(newGroup, timeout, identifier) {
plugin.join = function(newGroup, timeout, usage) {
return plugin.get()
.then(function() {
if (currentGroup.group !== newGroup.group) {
@@ -57,10 +57,11 @@ module.exports = syrup.serial()
, wireutil.envelope(new wire.JoinGroupMessage(
options.serial
, currentGroup
, usage
))
])
plugin.emit('join', currentGroup, identifier)
plugin.emit('join', currentGroup)
return currentGroup
})
@@ -113,7 +114,7 @@ module.exports = syrup.serial()
var reply = wireutil.reply(options.serial)
grouputil.match(ident, message.requirements)
.then(function() {
return plugin.join(message.owner, message.timeout)
return plugin.join(message.owner, message.timeout, message.usage)
})
.then(function() {
push.send([