mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix and AttributeError
on Windows
``` AttributeError: module 'signal' has no attribute 'SIGALRM'. Did you mean: 'SIGABRT'? ``` Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
2ff09f5e8d
commit
d8facee4de
2 changed files with 6 additions and 4 deletions
|
@ -699,7 +699,8 @@ allowed-3rd-party-modules=msgpack,
|
||||||
packaging,
|
packaging,
|
||||||
looseversion,
|
looseversion,
|
||||||
pytestskipmarkers,
|
pytestskipmarkers,
|
||||||
cryptography
|
cryptography,
|
||||||
|
pytest_timeout
|
||||||
|
|
||||||
[EXCEPTIONS]
|
[EXCEPTIONS]
|
||||||
|
|
||||||
|
|
|
@ -11,16 +11,17 @@ from datetime import datetime, timedelta
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import requests
|
import requests
|
||||||
|
from pytest_timeout import DEFAULT_METHOD
|
||||||
|
|
||||||
import salt.utils.aws as aws
|
import salt.utils.aws as aws
|
||||||
from tests.support.helpers import patched_environ
|
from tests.support.helpers import patched_environ
|
||||||
from tests.support.mock import MagicMock, patch
|
from tests.support.mock import MagicMock, patch
|
||||||
|
|
||||||
pytestmark = [
|
pytestmark = [
|
||||||
# Skip testing on windows since it does not support signals
|
# Skip testing on windows since it does not support signal.SIGALRM
|
||||||
# which is what the timeout marker is using.
|
# which is what the timeout marker is using by default.
|
||||||
pytest.mark.skip_on_windows,
|
pytest.mark.skip_on_windows,
|
||||||
pytest.mark.timeout(60, method="signal"),
|
pytest.mark.timeout(60, method=DEFAULT_METHOD),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue