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 #42885 from terminalmage/fix-f26-tests

Browse source 
Move weird tearDown test to an actual tearDown
This commit is contained in:
Nicole Thomas 2017-08-11 15:14:41 -04:00 • committed by GitHub
commit b21778efac
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/integration/shell/test_auth.py
View file

@ -54,7 +54,6 @@ class AuthTest(ShellCase):
group = 'saltops'
def setUp(self):
# This is a little wasteful but shouldn't be a problem
for user in (self.userA, self.userB):
try:
pwd.getpwnam(user)
@ -68,6 +67,21 @@ class AuthTest(ShellCase):
self.run_call('group.add {0}'.format(self.group))
self.run_call('user.chgroups {0} {1} True'.format(self.userB, self.group))
def tearDown(self):
for user in (self.userA, self.userB):
try:
pwd.getpwnam(user)
except KeyError:
pass
else:
self.run_call('user.delete {0}'.format(user))
try:
grp.getgrnam(self.group)
except KeyError:
pass
else:
self.run_call('group.delete {0}'.format(self.group))
def test_pam_auth_valid_user(self):
'''
test that pam auth mechanism works with a valid user
@ -121,10 +135,3 @@ class AuthTest(ShellCase):
self.assertTrue(
'minion:' in resp
)
def test_zzzz_tearDown(self):
for user in (self.userA, self.userB):
if pwd.getpwnam(user):
self.run_call('user.delete {0}'.format(user))
if grp.getgrnam(self.group):
self.run_call('group.delete {0}'.format(self.group))