valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support the supression of prints in the wheel module

Browse Source 
This will clean up all those pesky key output issues in the wheel tests.
This commit is contained in:
Mike Place 2016-08-22 13:11:38 +09:00
parent 7f137835b9
commit b4f71e0260
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/wheel/__init__.py
View File

@ -50,7 +50,7 @@ class WheelClient(salt.client.mixins.SyncClientMixin,
''' '''
Backwards compatibility Backwards compatibility
''' '''
return self.low(fun, kwargs) return self.low(fun, kwargs, print_event=low.get('print_event', True), full_return=low.get('full_return', False))
# TODO: Inconsistent with runner client-- the runner client's master_call gives # TODO: Inconsistent with runner client-- the runner client's master_call gives
# an async return, unlike this # an async return, unlike this

3
tests/integration/wheel/client.py
View File

@ -35,6 +35,7 @@ class WheelModuleTest(integration.TestCase, integration.AdaptedConfigurationTest
low = { low = {
'client': 'wheel', 'client': 'wheel',
'fun': 'key.list_all', 'fun': 'key.list_all',
'print_event': False
} }
low.update(self.eauth_creds) low.update(self.eauth_creds)
@ -60,12 +61,14 @@ class WheelModuleTest(integration.TestCase, integration.AdaptedConfigurationTest
'client': 'wheel', 'client': 'wheel',
'fun': 'key.list_all', 'fun': 'key.list_all',
'token': token['token'], 'token': token['token'],
'print_event': False,
}) })
def test_cmd_sync(self): def test_cmd_sync(self):
low = { low = {
'client': 'wheel', 'client': 'wheel',
'fun': 'key.list_all', 'fun': 'key.list_all',
'print_event': False,
} }
low.update(self.eauth_creds) low.update(self.eauth_creds)

4
tests/integration/wheel/key.py
View File

@ -13,12 +13,12 @@ class KeyWheelModuleTest(integration.TestCase, integration.AdaptedConfigurationT
self.wheel = salt.wheel.Wheel(dict(self.get_config('client_config'))) self.wheel = salt.wheel.Wheel(dict(self.get_config('client_config')))
def test_list_all(self): def test_list_all(self):
ret = self.wheel.call_func('key.list_all') ret = self.wheel.cmd('key.list_all', print_event=False)
for host in ['minion', 'sub_minion']: for host in ['minion', 'sub_minion']:
self.assertIn(host, ret['minions']) self.assertIn(host, ret['minions'])
def test_gen(self): def test_gen(self):
ret = self.wheel.call_func('key.gen', id_='soundtechniciansrock') ret = self.wheel.cmd('key.gen', id_='soundtechniciansrock', print_event=False)
self.assertIn('pub', ret) self.assertIn('pub', ret)
self.assertIn('priv', ret) self.assertIn('priv', ret)