You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ariatosca.apache.org by mx...@apache.org on 2017/07/04 10:58:51 UTC
incubator-ariatosca git commit: only test_events - with close 1
Repository: incubator-ariatosca
Updated Branches:
refs/heads/build_fail_poc 0ed899cd9 -> 466c6a9a0
only test_events - with close 1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/466c6a9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/466c6a9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/466c6a9a
Branch: refs/heads/build_fail_poc
Commit: 466c6a9a0ab4879b7f1cbf15f2b892133aec9572
Parents: 0ed899c
Author: max-orlov <ma...@gigaspaces.com>
Authored: Tue Jul 4 13:58:45 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Tue Jul 4 13:58:45 2017 +0300
----------------------------------------------------------------------
.travis.yml | 6 ----
.../orchestrator/workflows/core/test_events.py | 2 ++
tox.ini | 33 +++-----------------
3 files changed, 6 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/466c6a9a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index de02d78..8037b7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,8 @@ language: python
python:
- "2.7"
env:
-- TOX_ENV=pylint_code
-- TOX_ENV=pylint_tests
- TOX_ENV=py27
- TOX_ENV=py26
-- TOX_ENV=py27e2e
-- TOX_ENV=py26e2e
-- TOX_ENV=py27ssh
-- TOX_ENV=py26ssh
install:
- pip install --upgrade pip
- pip install --upgrade setuptools
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/466c6a9a/tests/orchestrator/workflows/core/test_events.py
----------------------------------------------------------------------
diff --git a/tests/orchestrator/workflows/core/test_events.py b/tests/orchestrator/workflows/core/test_events.py
index ff50eab..467724e 100644
--- a/tests/orchestrator/workflows/core/test_events.py
+++ b/tests/orchestrator/workflows/core/test_events.py
@@ -119,6 +119,8 @@ def run_operation_on_node(ctx, op_name, interface_name):
eng = engine.Engine(executors={ThreadExecutor: ThreadExecutor()})
eng.execute(ctx)
+ for executor in eng._executors.values():
+ executor.close()
return node
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/466c6a9a/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 981a524..5a66af8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,39 +25,14 @@ deps =
basepython =
py26: python2.6
py27: python2.7
- py26e2e: python2.6
- py27e2e: python2.7
- py26ssh: python2.6
- py27ssh: python2.7
pywin: {env:PYTHON:}\python.exe
- pylint_code: python2.7
- pylint_tests: python2.7
+
[testenv:py27]
-commands=pytest tests --full-trace --ignore=tests/orchestrator/workflows/core/test_events.py --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria
+commands=pytest tests/orchestrator/workflows/core/test_events.py
[testenv:py26]
-commands=pytest tests --full-trace --ignore=tests/orchestrator/workflows/core/test_events.py --ignore=tests/end2end --ignore=tests/orchestrator/execution_plugin/test_ssh.py --cov-report term-missing --cov aria
-
-[testenv:py27e2e]
-commands=pytest tests/end2end --cov-report term-missing --cov aria
-
-[testenv:py26e2e]
-commands=pytest tests/end2end --cov-report term-missing --cov aria
+commands=pytest tests/orchestrator/workflows/core/test_events.py
[testenv:pywin]
-commands=pytest tests --full-trace --ignore=tests/orchestrator/workflows/core/test_events.py --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 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
-
-[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
+commands=pytest tests/orchestrator/workflows/core/test_events.py