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

fix state grains silently fails #24319

Browse source
This commit is contained in:
Christophe Drevet-Droguet 2015-06-02 13:25:31 +02:00
parent ca1af20203
commit 8a63d1ebbe
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/states/grains.py
View file

@ -190,6 +190,7 @@ def list_absent(name, value):
.format(name, value)
ret['changes'] = {'deleted': value}
else:
ret['result'] = False
ret['comment'] = 'Grain {0} is not a valid list'\
.format(name)
else:
@ -304,8 +305,10 @@ def append(name, value, convert=False):
.format(name, value)
ret['changes'] = {'added': value}
else:
ret['result'] = False
ret['comment'] = 'Grain {0} is not a valid list'\
.format(name)
else:
ret['result'] = False
ret['comment'] = 'Grain {0} does not exist'.format(name)
return ret

6
tests/unit/states/grains_test.py
View file

@ -149,7 +149,7 @@ class GrainsTestCase(TestCase):
ret2 = {'changes': {}, 'name': self.name, 'result': True,
'comment': 'Grain cheese does not exist'}
ret3 = {'changes': {}, 'name': self.name, 'result': True,
ret3 = {'changes': {}, 'name': self.name, 'result': False,
'comment': 'Grain cheese is not a valid list'}
with patch.dict(grains.__grains__, {self.name: ['eves']}):
@ -203,10 +203,10 @@ class GrainsTestCase(TestCase):
'result': None,
'comment': comment}
ret3 = {'changes': {}, 'name': self.name, 'result': True,
ret3 = {'changes': {}, 'name': self.name, 'result': False,
'comment': 'Grain cheese does not exist'}
ret4 = {'changes': {}, 'name': self.name, 'result': True,
ret4 = {'changes': {}, 'name': self.name, 'result': False,
'comment': 'Grain cheese is not a valid list'}
with patch.dict(grains.__grains__, {self.name: ['edam']}):