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 #49643 from rallytime/bp-49642

Browse source 
Back-port #49642 to 2017.7
This commit is contained in:
Nicole Thomas 2018-09-13 12:45:38 -04:00 • committed by GitHub
commit 8ac66f1965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/reactor/test_reactor.py
View file

@ -24,7 +24,7 @@ class ReactorTest(ModuleCase, SaltMinionEventAssertsMixin):
Test Salt's reactor system
'''
@flaky()
@flaky
def test_ping_reaction(self):
'''
Fire an event on the master and ensure

3
tests/integration/shell/test_call.py
View file

@ -381,6 +381,7 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin
if os.path.isdir(config_dir):
shutil.rmtree(config_dir)
@skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
@flaky
def test_issue_15074_output_file_append(self):
output_file_append = os.path.join(TMP, 'issue-15074')
@ -414,6 +415,8 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin
if os.path.exists(output_file_append):
os.unlink(output_file_append)
@skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
@flaky
def test_issue_14979_output_file_permissions(self):
output_file = os.path.join(TMP, 'issue-14979')
with salt.utils.files.set_umask(0o077):

3
tests/integration/shell/test_matcher.py
View file

@ -14,6 +14,7 @@ from tests.support.case import ShellCase
from tests.support.helpers import flaky
from tests.support.mixins import ShellCaseCommonTestsMixin
from tests.support.paths import TMP
from tests.support.unit import skipIf
# Import salt libs
import salt.utils
@ -94,12 +95,14 @@ class MatchTest(ShellCase, ShellCaseCommonTestsMixin):
assert minion_in_returns('minion', data) is True
assert minion_in_returns('sub_minion', data) is True
@skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
@flaky
def test_compound_pillar(self):
data = self.run_salt("-C 'I%@companions%three%sarah*' test.ping")
assert minion_in_returns('minion', data) is True
assert minion_in_returns('sub_minion', data) is True
@skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
@flaky
def test_coumpound_pillar_pcre(self):
data = self.run_salt("-C 'J%@knights%^(Lancelot|Galahad)$' test.ping")