Repository: incubator-ariatosca Updated Branches: refs/heads/build_fail_poc 143595e9e -> 887913d04
added pytest-timeout Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/887913d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/887913d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/887913d0 Branch: refs/heads/build_fail_poc Commit: 887913d044274ed66edc985b5bad0ea927bd4f91 Parents: 143595e Author: max-orlov <[email protected]> Authored: Mon Jul 3 12:47:16 2017 +0300 Committer: max-orlov <[email protected]> Committed: Mon Jul 3 12:47:16 2017 +0300 ---------------------------------------------------------------------- tests/requirements.txt | 1 + tox.ini | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/887913d0/tests/requirements.txt ---------------------------------------------------------------------- diff --git a/tests/requirements.txt b/tests/requirements.txt index cf57821..cf765b1 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -19,3 +19,4 @@ pylint==1.6.4 pytest==3.0.2 pytest-cov==2.3.1 pytest-mock==1.2 +pytest-timeout==1.2.0 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/887913d0/tox.ini ---------------------------------------------------------------------- diff --git a/tox.ini b/tox.ini index 9530a04..bf78fbf 100644 --- a/tox.ini +++ b/tox.ini @@ -34,27 +34,27 @@ basepython = pylint_tests: python2.7 [testenv:py27] -commands=pytest -vv tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria +commands=pytest -vv tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov --timeout=300 aria [testenv:py26] -commands=pytest -v tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria +commands=pytest -v tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov --timeout=300 aria [testenv:py27e2e] -commands=pytest -v tests/end2end --cov-report term-missing --cov aria +commands=pytest -v tests/end2end --cov-report term-missing --cov --timeout=300 aria [testenv:py26e2e] -commands=pytest -v tests/end2end --cov-report term-missing --cov aria +commands=pytest -v tests/end2end --cov-report term-missing --cov --timeout=300 aria [testenv:pywin] -commands=pytest -v tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria +commands=pytest -v tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov --timeout=300 aria [testenv:py27ssh] install_command=pip install {opts} {packages} .[ssh] -commands=pytest tests/orchestrator/execution_plugin/test_ssh.py +commands=pytest --timeout=300 tests/orchestrator/execution_plugin/test_ssh.py [testenv:py26ssh] install_command=pip install {opts} {packages} .[ssh] -commands=pytest tests/orchestrator/execution_plugin/test_ssh.py +commands=pytest --timeout=300 tests/orchestrator/execution_plugin/test_ssh.py [testenv:pylint_code] commands=pylint --rcfile=aria/.pylintrc --disable=fixme,missing-docstring aria extensions/aria_extension_tosca/
