Repository: incubator-ariatosca Updated Branches: refs/heads/build_fail_poc bda193e5e -> e81fe56fe (forced update)
removed -vv and 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/e81fe56f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e81fe56f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e81fe56f Branch: refs/heads/build_fail_poc Commit: e81fe56febd0f06d2dfb88d20c87012212626a46 Parents: d863a93 Author: max-orlov <[email protected]> Authored: Mon Jul 3 13:01:31 2017 +0300 Committer: max-orlov <[email protected]> Committed: Mon Jul 3 13:39:25 2017 +0300 ---------------------------------------------------------------------- tests/requirements.txt | 1 - tox.ini | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e81fe56f/tests/requirements.txt ---------------------------------------------------------------------- diff --git a/tests/requirements.txt b/tests/requirements.txt index cf765b1..cf57821 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -19,4 +19,3 @@ 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/e81fe56f/tox.ini ---------------------------------------------------------------------- diff --git a/tox.ini b/tox.ini index bf78fbf..b824420 100644 --- a/tox.ini +++ b/tox.ini @@ -34,30 +34,31 @@ 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 --timeout=300 aria +commands=pytest tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria [testenv:py26] -commands=pytest -v tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov --timeout=300 aria +commands=pytest tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria [testenv:py27e2e] -commands=pytest -v tests/end2end --cov-report term-missing --cov --timeout=300 aria +commands=pytest tests/end2end --cov-report term-missing --cov aria [testenv:py26e2e] -commands=pytest -v tests/end2end --cov-report term-missing --cov --timeout=300 aria +commands=pytest tests/end2end --cov-report term-missing --cov aria [testenv:pywin] -commands=pytest -v tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov --timeout=300 aria +commands=pytest tests --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria [testenv:py27ssh] install_command=pip install {opts} {packages} .[ssh] -commands=pytest --timeout=300 tests/orchestrator/execution_plugin/test_ssh.py +commands=pytest tests/orchestrator/execution_plugin/test_ssh.py [testenv:py26ssh] install_command=pip install {opts} {packages} .[ssh] -commands=pytest --timeout=300 tests/orchestrator/execution_plugin/test_ssh.py +commands=pytest tests/orchestrator/execution_plugin/test_ssh.py [testenv:pylint_code] commands=pylint --rcfile=aria/.pylintrc --disable=fixme,missing-docstring aria extensions/aria_extension_tosca/ [testenv:pylint_tests] commands=pylint --rcfile=tests/.pylintrc --disable=fixme,missing-docstring tests +
