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

Fixed more testing stuff, an egregious error

Browse source
This commit is contained in:
twangboy 2015-06-29 12:27:22 -06:00
parent aafd079c71
commit 96bc5aed10
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/user.py
View file

@ -693,9 +693,7 @@ def absent(name, purge=False, force=False):
ret['comment'] = 'User {0} set for removal'.format(name)
return ret
beforegroups = set(salt.utils.get_group_list(name))
ret['result'] = __salt__['user.delete'](name=name,
purge=purge,
force=force)
ret['result'] = __salt__['user.delete'](name, purge, force)
aftergroups = set([g for g in beforegroups if __salt__['group.info'](g)])
if ret['result']:
ret['changes'] = {}

2
tests/integration/modules/file.py
View file

@ -160,7 +160,7 @@ class FileModuleTest(integration.ModuleCase):
def test_cannot_remove(self):
ret = self.run_function('file.remove', arg=['tty'])
self.assertEqual(
'ERROR executing \'file.remove\': File path must be absolute.', ret
'ERROR executing \'file.remove\': File path must be absolute: tty', ret
)
def test_source_list_for_single_file_returns_unchanged(self):