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

grains module: simpler comment for already set key

Browse source
This commit is contained in:
Christophe Drevet-Droguet 2015-06-22 12:51:42 +02:00 • committed by rallytime
parent 2000180791
commit c63913e602
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/grains.py
View file

@ -612,7 +612,7 @@ def set(key,
_existing_value_type = 'complex'
if _existing_value_type is not None and _existing_value == val:
ret['comment'] = 'The value \'{0}\' was already set for key \'{1}\''.format(val, key)
ret['comment'] = 'Grain is already set'
return ret
if _existing_value is not None and not force:

8
tests/unit/modules/grains_test.py
View file

@ -292,23 +292,21 @@ class GrainsModuleTestCase(TestCase):
grainsmod.__grains__ = {'a': 12, 'c': 8}
res = grainsmod.set('a', 12)
self.assertTrue(res['result'])
self.assertEqual(res['comment'], 'The value \'12\' was already set for key \'a\'')
self.assertEqual(res['comment'], 'Grain is already set')
self.assertEqual(grainsmod.__grains__, {'a': 12, 'c': 8})
# Set a grain to the same complex value
grainsmod.__grains__ = {'a': ['item', 12], 'c': 8}
res = grainsmod.set('a', ['item', 12])
self.assertTrue(res['result'])
self.assertEqual(res['comment'], 'The value \'[\'item\', 12]\' was already set '
+ 'for key \'a\'')
self.assertEqual(res['comment'], 'Grain is already set')
self.assertEqual(grainsmod.__grains__, {'a': ['item', 12], 'c': 8})
# Set a key to the same simple value in a nested grain
grainsmod.__grains__ = {'a': 'aval', 'b': {'nested': 'val'}, 'c': 8}
res = grainsmod.set('b,nested', 'val', delimiter=',')
self.assertTrue(res['result'])
self.assertEqual(res['comment'], 'The value \'val\' was already set for key '
+ '\'b,nested\'')
self.assertEqual(res['comment'], 'Grain is already set')
self.assertEqual(grainsmod.__grains__, {'a': 'aval',
'b': {'nested': 'val'},
'c': 8})