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

Merge pull request #16451 from whiteinge/add-wheelclient-tests

Browse Source 
Add WheelClient integration tests for cmd_sync and cmd_async
This commit is contained in:
Pedro Algarvio 2014-10-08 00:54:55 +01:00
commit ba3aed6195
4 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/master.py
View File

@ -1913,7 +1913,7 @@ class ClearFuncs(object):
good = self.ckminions.wheel_check(
self.opts['external_auth'][clear_load['eauth']][name]
if name in self.opts['external_auth'][clear_load['eauth']]
else self.opts['external_auth'][token['eauth']]['*'],
else self.opts['external_auth'][clear_load['eauth']]['*'],
clear_load['fun'])
if not good:
msg = ('Authentication failure of type "eauth" occurred for '

2
salt/netapi/__init__.py
View File

@ -117,7 +117,7 @@ class NetapiClient(object):
'''
kwargs['fun'] = fun
wheel = salt.wheel.WheelClient(self.opts)
return wheel.master_call(**kwargs)
return wheel.cmd_sync(kwargs)
def wheel_async(self, fun, **kwargs):
'''

21
salt/wheel/__init__.py
View File

@ -98,26 +98,7 @@ class WheelClient(mixins.SyncClientMixin, mixins.AsyncClientMixin, object):
})
{'minions': {'jerry': '5d:f6:79:43:5e:d4:42:3f:57:b8:45:a8:7e:a4:6e:ca'}}
'''
sevent = salt.utils.event.get_event('master',
self.opts['sock_dir'],
self.opts['transport'],
opts=self.opts)
job = self.master_call(**low)
ret_tag = tagify('ret', base=job['tag'])
timelimit = time.time() + (timeout or 300)
while True:
ret = sevent.get_event(full=True)
if ret is None:
continue
if ret['tag'] == ret_tag:
return ret['data']['return']
if time.time() > timelimit:
raise salt.exceptions.SaltClientTimeout(
"WheelClient job '%s' timed out", job['jid'],
jid=job['jid'])
return self.master_call(**low)
def cmd_async(self, low):
'''

50
tests/integration/wheel/__init__.py
View File

@ -11,6 +11,12 @@ import salt.wheel
class WheelModuleTest(integration.ClientCase):
eauth_creds = {
'username': 'saltdev_auto',
'password': 'saltdev',
'eauth': 'auto',
}
def setUp(self):
'''
Configure an eauth user to test with
@ -24,13 +30,13 @@ class WheelModuleTest(integration.ClientCase):
The choice of using key.list_all for this is arbitrary and should be
changed to some mocked function that is more testing friendly.
'''
self.wheel.master_call(**{
low = {
'client': 'wheel',
'fun': 'key.list_all',
'eauth': 'auto',
'username': 'saltdev_auto',
'password': 'saltdev',
})
}
low.update(self.eauth_creds)
self.wheel.master_call(**low)
def test_token(self):
'''
@ -45,11 +51,7 @@ class WheelModuleTest(integration.ClientCase):
self.mkdir_p(os.path.join(opts['root_dir'], 'cache', 'tokens'))
auth = salt.auth.LoadAuth(opts)
token = auth.mk_token({
'username': 'saltdev_auto',
'password': 'saltdev',
'eauth': 'auto',
})
token = auth.mk_token(self.eauth_creds)
self.wheel.master_call(**{
'client': 'wheel',
@ -57,6 +59,34 @@ class WheelModuleTest(integration.ClientCase):
'token': token['token'],
})
def test_cmd_sync(self):
low = {
'client': 'wheel',
'fun': 'key.list_keys',
}
low.update(self.eauth_creds)
self.wheel.cmd_sync(low)
def test_cmd_async(self):
low = {
'client': 'wheel_async',
'fun': 'key.list_keys',
}
low.update(self.eauth_creds)
self.wheel.cmd_async(low)
def test_cmd_sync_w_arg(self):
low = {
'fun': 'key.finger',
'match': '*',
}
low.update(self.eauth_creds)
ret = self.wheel.cmd_sync(low)
self.assertIn('return', ret.get('data', {}))
def test_wildcard_auth(self):
low = {
'username': 'the_s0und_of_t3ch',