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 #48885 from rallytime/flaky-tests-shadow

Browse source 
Mark shadow module integration test as flaky
This commit is contained in:
Nicole Thomas 2018-08-02 15:04:34 -04:00 • committed by GitHub
commit 52722f6ded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/modules/test_shadow.py
View file

@ -12,7 +12,7 @@ import os
# Import Salt Testing libs
from tests.support.case import ModuleCase
from tests.support.unit import skipIf
from tests.support.helpers import destructiveTest, skip_if_not_root
from tests.support.helpers import destructiveTest, flaky, skip_if_not_root
# Import salt libs
import salt.utils
@ -142,6 +142,7 @@ class ShadowModuleTest(ModuleCase):
# User does not exist (set_inactdays return None is user does not exist)
self.assertFalse(self.run_function('shadow.set_mindays', [self._no_user, 12]))
@flaky
@destructiveTest
def test_lock_password(self):
'''
@ -214,19 +215,19 @@ class ShadowModuleTest(ModuleCase):
'''
Test set/del password for root
'''
#saving shadow file
# saving shadow file
if not os.access("/etc/shadow", os.R_OK | os.W_OK):
self.skipTest('Could not save initial state of /etc/shadow')
with salt.utils.fopen('/etc/shadow', 'r') as sFile:
shadow = sFile.read()
#set root password
# set root password
self.assertTrue(self.run_function('shadow.set_password', ['root', self._password]))
self.assertEqual(
self.run_function('shadow.info', ['root'])['passwd'], self._password)
#delete root password
# delete root password
self.assertTrue(self.run_function('shadow.del_password', ['root']))
self.assertEqual(
self.run_function('shadow.info', ['root'])['passwd'], '')
#restore shadow file
# restore shadow file
with salt.utils.fopen('/etc/shadow', 'w') as sFile:
sFile.write(shadow)