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

Fix unit tests for PR #41509

Browse Source
This commit is contained in:
Sean Jenkins 2017-05-31 17:21:26 -06:00
parent eb7ef3c856
commit 095e5949a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/keystone.py
View File

@ -791,7 +791,7 @@ def endpoint_absent(name, region=None, profile=None, interface=None, **connectio
profile=profile, profile=profile,
interface=interface, interface=interface,
**connection_args) **connection_args)
if not endpoint or 'Error' in endpoint: if not endpoint:
return ret return ret
else: else:
if __opts__.get('test'): if __opts__.get('test'):

4
tests/unit/states/keystone_test.py
View File

@ -317,7 +317,7 @@ class KeystoneTestCase(TestCase):
'keystone.endpoint_create': mock}): 'keystone.endpoint_create': mock}):
comt = ('Endpoint for service "{0}" already exists'.format(name)) comt = ('Endpoint for service "{0}" already exists'.format(name))
ret.update({'comment': comt, 'result': None, 'changes': {}}) ret.update({'comment': comt, 'result': True, 'changes': {}})
self.assertDictEqual(keystone.endpoint_present(name), ret) self.assertDictEqual(keystone.endpoint_present(name), ret)
with patch.dict(keystone.__opts__, {'test': True}): with patch.dict(keystone.__opts__, {'test': True}):
@ -326,7 +326,7 @@ class KeystoneTestCase(TestCase):
self.assertDictEqual(keystone.endpoint_present(name), ret) self.assertDictEqual(keystone.endpoint_present(name), ret)
comt = ('Endpoint for service "{0}" already exists'.format(name)) comt = ('Endpoint for service "{0}" already exists'.format(name))
ret.update({'comment': comt, 'result': None, 'changes': {}}) ret.update({'comment': comt, 'result': True, 'changes': {}})
self.assertDictEqual(keystone.endpoint_present(name), ret) self.assertDictEqual(keystone.endpoint_present(name), ret)
with patch.dict(keystone.__opts__, {'test': False}): with patch.dict(keystone.__opts__, {'test': False}):