mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skip initial relenv onedir known failures
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
5dbf87ff17
commit
606731993b
4 changed files with 5 additions and 0 deletions
|
@ -134,6 +134,7 @@ def test_exit_status_correct_usage(salt_cli, salt_minion):
|
|||
|
||||
@pytest.mark.slow_test
|
||||
@pytest.mark.skip_on_windows(reason="Windows does not support SIGINT")
|
||||
@pytest.mark.skip_initial_onedir_failure
|
||||
def test_interrupt_on_long_running_job(salt_cli, salt_master, salt_minion):
|
||||
"""
|
||||
Ensure that a call to ``salt`` that is taking too long, when a user
|
||||
|
|
|
@ -19,6 +19,7 @@ log = logging.getLogger(__name__)
|
|||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_initial_onedir_failure,
|
||||
pytest.mark.skip_if_binaries_missing(*KNOWN_BINARY_NAMES, check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ pytestmark = [
|
|||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_windows,
|
||||
pytest.mark.skip_on_aix,
|
||||
pytest.mark.skip_initial_onedir_failure,
|
||||
pytest.mark.skip_if_binaries_missing(*KNOWN_BINARY_NAMES, check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -261,6 +261,7 @@ class VTTestCase(TestCase):
|
|||
def generate_multibyte_stderr_unicode(block_size):
|
||||
return b"\x2E" + VTTestCase.generate_multibyte_stdout_unicode(block_size)
|
||||
|
||||
@pytest.mark.skip_initial_onedir_failure
|
||||
@pytest.mark.skip_on_windows(reason="Skip VT tests on windows, due to issue 54290")
|
||||
@fixStdOutErrFileNoIfNeeded
|
||||
def test_split_multibyte_characters_unicode(self):
|
||||
|
@ -331,6 +332,7 @@ class VTTestCase(TestCase):
|
|||
def generate_multibyte_stderr_shiftjis(block_size):
|
||||
return b"\x2E" + VTTestCase.generate_multibyte_stdout_shiftjis(block_size)
|
||||
|
||||
@pytest.mark.skip_initial_onedir_failure
|
||||
@pytest.mark.skip_on_windows(reason="Skip VT tests on windows, due to issue 54290")
|
||||
@fixStdOutErrFileNoIfNeeded
|
||||
def test_split_multibyte_characters_shiftjis(self):
|
||||
|
|
Loading…
Add table
Reference in a new issue