mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
Always remove the users/groups added to the system
This commit is contained in:
parent
8d29140cdc
commit
7e57813243
@ -38,32 +38,38 @@ class UseraddModuleTest(integration.ModuleCase):
|
|||||||
uname = self.__random_string()
|
uname = self.__random_string()
|
||||||
if self.run_function('user.add', [uname]) is not True:
|
if self.run_function('user.add', [uname]) is not True:
|
||||||
# Skip because creating is not what we're testing here
|
# Skip because creating is not what we're testing here
|
||||||
|
self.run_function('user.delete', [uname, True, True])
|
||||||
self.skipTest('Failed to create user')
|
self.skipTest('Failed to create user')
|
||||||
|
|
||||||
uinfo = self.run_function('user.info', [uname])
|
try:
|
||||||
self.assertIn(uname, uinfo['groups'])
|
uinfo = self.run_function('user.info', [uname])
|
||||||
|
self.assertIn(uname, uinfo['groups'])
|
||||||
|
|
||||||
# This uid is available, store it
|
# This uid is available, store it
|
||||||
uid = uinfo['uid']
|
uid = uinfo['uid']
|
||||||
|
|
||||||
self.run_function('user.delete', [uname, True, True])
|
self.run_function('user.delete', [uname, True, True])
|
||||||
|
|
||||||
# Now, a weird group id
|
# Now, a weird group id
|
||||||
gname = self.__random_string()
|
gname = self.__random_string()
|
||||||
if self.run_function('group.add', [gname]) is not True:
|
if self.run_function('group.add', [gname]) is not True:
|
||||||
self.skipTest('Failed to create group')
|
self.run_function('group.delete', [gname, True, True])
|
||||||
|
self.skipTest('Failed to create group')
|
||||||
|
|
||||||
ginfo = self.run_function('group.info', [gname])
|
ginfo = self.run_function('group.info', [gname])
|
||||||
|
|
||||||
# And create the user with that gid
|
# And create the user with that gid
|
||||||
if self.run_function('user.add', [uname, uid, ginfo['gid']]) is False:
|
if self.run_function('user.add', [uname, uid, ginfo['gid']]) is False:
|
||||||
# Skip because creating is not what we're testing here
|
# Skip because creating is not what we're testing here
|
||||||
self.skipTest('Failed to create user')
|
self.run_function('user.delete', [uname, True, True])
|
||||||
|
self.skipTest('Failed to create user')
|
||||||
|
|
||||||
uinfo = self.run_function('user.info', [uname])
|
uinfo = self.run_function('user.info', [uname])
|
||||||
self.assertIn(gname, uinfo['groups'])
|
self.assertIn(gname, uinfo['groups'])
|
||||||
|
|
||||||
self.run_function('user.delete', [uname, True, True])
|
except AssertionError:
|
||||||
|
self.run_function('user.delete', [uname, True, True])
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
Loading…
Reference in New Issue
Block a user