saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #47255 from garethgreenaway/47239_fixes_to_salt_proxy_beacon

Browse source 
[2018.3] Fixes to salt_proxy beacon and beacon tests
This commit is contained in:
Nicole Thomas 2018-04-25 09:41:50 -04:00 • committed by GitHub
commit ea2d68b865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/beacons/salt_proxy.py
View file

@ -54,6 +54,7 @@ def validate(config):
if not isinstance(_config['proxies'], dict):
return False, ('Proxies for salt_proxy '
'beacon must be a dictionary.')
return True, 'Valid beacon configuration'
def beacon(config):

2
tests/unit/beacons/test_salt_proxy_beacon.py
View file

@ -53,6 +53,7 @@ class SaltProxyBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'proxies': {'p8000': ''}}]
ret = salt_proxy.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = salt_proxy.beacon(config)
self.assertEqual(ret, [{'p8000': 'Proxy p8000 is already running'}])
@ -75,6 +76,7 @@ class SaltProxyBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'proxies': {'p8000': ''}}]
ret = salt_proxy.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = salt_proxy.beacon(config)
self.assertEqual(ret, [{'p8000': 'Proxy p8000 was started'}])

5
tests/unit/beacons/test_sensehat_beacon.py
View file

@ -59,6 +59,7 @@ class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'sensors': {'humidity': '70%'}}]
ret = sensehat.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = sensehat.beacon(config)
self.assertEqual(ret, [{'tag': 'sensehat/humidity',
@ -69,6 +70,7 @@ class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'sensors': {'temperature': 20}}]
ret = sensehat.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = sensehat.beacon(config)
self.assertEqual(ret, [{'tag': 'sensehat/temperature',
@ -79,6 +81,7 @@ class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'sensors': {'temperature': [20, 29]}}]
ret = sensehat.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = sensehat.beacon(config)
self.assertEqual(ret, [{'tag': 'sensehat/temperature',
@ -89,6 +92,7 @@ class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'sensors': {'pressure': '1400'}}]
ret = sensehat.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = sensehat.beacon(config)
self.assertEqual(ret, [{'tag': 'sensehat/pressure',
@ -99,6 +103,7 @@ class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin):
config = [{'sensors': {'pressure': '1600'}}]
ret = sensehat.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = sensehat.beacon(config)
self.assertEqual(ret, [])

19
tests/unit/beacons/test_status_beacon.py
View file

@ -44,7 +44,11 @@ class StatusBeaconTestCase(TestCase, LoaderModuleMockMixin):
}
def test_empty_config(self, *args, **kwargs):
config = {}
config = []
ret = status.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = status.beacon(config)
if sys.platform.startswith('win'):
@ -56,17 +60,16 @@ class StatusBeaconTestCase(TestCase, LoaderModuleMockMixin):
def test_deprecated_dict_config(self):
config = {'time': ['all']}
ret = status.beacon(config)
if sys.platform.startswith('win'):
expected = []
else:
expected = ['time']
self.assertEqual(list(ret[0]['data']), expected)
ret = status.validate(config)
self.assertEqual(ret, (False, 'Configuration for status beacon must be a list.'))
def test_list_config(self):
config = [{'time': ['all']}]
ret = status.validate(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
ret = status.beacon(config)
if sys.platform.startswith('win'):

3
tests/unit/beacons/test_telegram_bot_msg_beacon.py
View file

@ -81,6 +81,7 @@ class TelegramBotMsgBeaconTestCase(TestCase, LoaderModuleMockMixin):
inst.get_updates.return_value = []
ret = telegram_bot_msg.beacon(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
telegram_api.Bot.assert_called_once_with(token)
self.assertEqual(ret, [])
@ -107,6 +108,7 @@ class TelegramBotMsgBeaconTestCase(TestCase, LoaderModuleMockMixin):
inst.get_updates.return_value = [update]
ret = telegram_bot_msg.beacon(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
telegram_api.Bot.assert_called_once_with(token)
self.assertEqual(ret, [])
@ -131,6 +133,7 @@ class TelegramBotMsgBeaconTestCase(TestCase, LoaderModuleMockMixin):
inst.get_updates.return_value = [update]
ret = telegram_bot_msg.beacon(config)
self.assertEqual(ret, (True, 'Valid beacon configuration'))
telegram_api.Bot.assert_called_once_with(token)
self.assertTrue(ret)