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 #24328 from dr4Ke/fix_state_grains_silently_fails_2015.5

Browse source 
Fix state grains silently fails 2015.5
This commit is contained in:
Justin Findlay 2015-06-02 09:18:46 -06:00
commit 88a997e6ee
2 changed files with 16 additions and 1 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

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

@ -149,6 +149,9 @@ class GrainsTestCase(TestCase):
ret2 = {'changes': {}, 'name': self.name, 'result': True,
'comment': 'Grain cheese does not exist'}
ret3 = {'changes': {}, 'name': self.name, 'result': False,
'comment': 'Grain cheese is not a valid list'}
with patch.dict(grains.__grains__, {self.name: ['eves']}):
self.assertDictEqual(grains.list_absent(self.name, self.value), ret)
@ -159,6 +162,9 @@ class GrainsTestCase(TestCase):
self.assertDictEqual(grains.list_absent(self.name, self.value), ret2)
with patch.dict(grains.__grains__, {self.name: 'eves'}):
self.assertDictEqual(grains.list_absent(self.name, self.value), ret3)
# 'absent' function tests: 1
def test_absent(self):
@ -197,9 +203,12 @@ 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': False,
'comment': 'Grain cheese is not a valid list'}
with patch.dict(grains.__grains__, {self.name: ['edam']}):
self.assertDictEqual(grains.append(self.name, self.value), ret)
@ -214,6 +223,9 @@ class GrainsTestCase(TestCase):
self.assertDictEqual(grains.append(self.name, self.value), ret3)
with patch.dict(grains.__grains__, {self.name: 'eves'}):
self.assertDictEqual(grains.append(self.name, self.value), ret4)
if __name__ == '__main__':
from integration import run_tests