Merge pull request saltstack#39352 from Unity-Technologies/hotfix/adb…

…_no_devices

Fix adb beacon when there are no devices

salt/beacons/adb.py

@@ -17,7 +17,7 @@
 __virtualname__ = 'adb'
 
 last_state = {}
-last_state_extra = {'value': False}
+last_state_extra = {'value': False, 'no_devices': False}
 
 
 def __virtual__():
@@ -125,11 +125,11 @@ def beacon(config):
 
     # Maybe send an event if we don't have any devices
     if 'no_devices_event' in config and config['no_devices_event'] is True:
-        if len(lines) == 0 and not last_state_extra['no_devices']:
+        if len(found_devices) == 0 and not last_state_extra['no_devices']:
             ret.append({'tag': 'no_devices'})
 
     # Did we have no devices listed this time around?
 
-    last_state_extra['no_devices'] = len(lines) == 0
+    last_state_extra['no_devices'] = len(found_devices) == 0
 
     return ret

tests/unit/beacons/adb_beacon_test.py

@@ -137,6 +137,27 @@ def test_no_devices_with_different_states(self):
     def test_no_devices_no_repeat(self):
         config = {'states': ['offline', 'device'], 'no_devices_event': True}
 
+        out = [
+            'List of devices attached\nHTC\tdevice',
+            'List of devices attached',
+            'List of devices attached'
+        ]
+
+        mock = Mock(side_effect=out)
+        with patch.dict(adb.__salt__, {'cmd.run': mock}):
+
+            ret = adb.beacon(config)
+            self.assertEqual(ret, [{'device': 'HTC', 'state': 'device', 'tag': 'device'}])
+
+            ret = adb.beacon(config)
+            self.assertEqual(ret, [{'tag': 'no_devices'}])
+
+            ret = adb.beacon(config)
+            self.assertEqual(ret, [])
+
+    def test_no_devices(self):
+        config = {'states': ['offline', 'device'], 'no_devices_event': True}
+
         out = [
             'List of devices attached',
             'List of devices attached'