Fix integration tests for 'user.present' state.

This commit is contained in:
Pablo Suárez Hernández 2018-01-11 09:35:44 +00:00
parent e2c32dc6dc
commit 52f9c06908
No known key found for this signature in database
GPG key ID: A9683F02B512C911

View file

@ -97,15 +97,25 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
home=HOMEDIR)
self.assertSaltTrueReturn(ret)
def test_user_present_nondefault(self):
@requires_system_grains
def test_user_present_nondefault(self, grains=None):
'''
This is a DESTRUCTIVE TEST it creates a new user on the on the minion.
'''
ret = self.run_state('user.present', name=self.user_name,
home=self.user_home)
self.assertSaltTrueReturn(ret)
ret = self.run_function('user.info', [self.user_name])
self.assertReturnNonEmptySaltType(ret)
group_name = grp.getgrgid(ret['gid']).gr_name
if not salt.utils.is_darwin():
self.assertTrue(os.path.isdir(self.user_home))
if grains['os_family'] in ('Suse',):
self.assertEqual(group_name, 'users')
elif grains['os_family'] == 'MacOS':
self.assertEqual(group_name, 'staff')
else:
self.assertEqual(group_name, self.user_name)
@requires_system_grains
def test_user_present_gid_from_name_default(self, grains=None):
@ -120,22 +130,26 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
# user
gid_from_name = False if grains['os_family'] == 'MacOS' else True
ret = self.run_state('user.present', name=self.user_name,
ret_user_present = self.run_state('user.present', name=self.user_name,
gid_from_name=gid_from_name, home=self.user_home)
self.assertSaltTrueReturn(ret)
ret = self.run_function('user.info', [self.user_name])
self.assertReturnNonEmptySaltType(ret)
group_name = grp.getgrgid(ret['gid']).gr_name
if not salt.utils.is_darwin():
self.assertTrue(os.path.isdir(self.user_home))
if grains['os_family'] in ('Suse',):
self.assertEqual(group_name, 'users')
elif grains['os_family'] == 'MacOS':
self.assertEqual(group_name, 'staff')
if gid_from_name:
self.assertSaltFalseReturn(ret_user_present)
ret_user_present = ret_user_present[next(iter(ret_user_present))]
self.assertTrue('is not present' in ret_user_present['comment'])
else:
self.assertEqual(group_name, self.user_name)
self.assertSaltTrueReturn(ret_user_present)
ret_user_info = self.run_function('user.info', [self.user_name])
self.assertReturnNonEmptySaltType(ret_user_info)
group_name = grp.getgrgid(ret_user_info['gid']).gr_name
if not salt.utils.is_darwin():
self.assertTrue(os.path.isdir(self.user_home))
if grains['os_family'] in ('Suse',):
self.assertEqual(group_name, 'users')
elif grains['os_family'] == 'MacOS':
self.assertEqual(group_name, 'staff')
else:
self.assertEqual(group_name, self.user_name)
def test_user_present_gid_from_name(self):
'''