Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-48-aria-cli dbf4cbb07 -> cb581d51b
fixed a test Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/cb581d51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/cb581d51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/cb581d51 Branch: refs/heads/ARIA-48-aria-cli Commit: cb581d51b6bd8a8d99563ad69f7498e683ba3c02 Parents: dbf4cbb Author: Ran Ziv <[email protected]> Authored: Sun Apr 2 12:14:37 2017 +0300 Committer: Ran Ziv <[email protected]> Committed: Sun Apr 2 12:14:37 2017 +0300 ---------------------------------------------------------------------- aria/orchestrator/workflow_runner.py | 3 ++- requirements.in | 2 +- tests/utils/test_threading.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cb581d51/aria/orchestrator/workflow_runner.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflow_runner.py b/aria/orchestrator/workflow_runner.py index 124104e..8b6b431 100644 --- a/aria/orchestrator/workflow_runner.py +++ b/aria/orchestrator/workflow_runner.py @@ -104,7 +104,7 @@ class WorkflowRunner(object): # not a part of the service's workflows field if self._workflow_name not in BUILTIN_WORKFLOWS: workflow_inputs = {k: v for k, v in - self.service.workflows[self._workflow_name].properties + self.service.workflows[self._workflow_name].inputs if k not in WORKFLOW_POLICY_INTERNAL_PROPERTIES} execution.inputs = modeling_utils.create_inputs(inputs, workflow_inputs) @@ -136,6 +136,7 @@ class WorkflowRunner(object): try: # TODO: perhaps pass to import_fullname as paths instead of appending to sys path? + # TODO: revisit; workflow.implementation to be used instead? sys.path.append(workflow.properties['implementation'].value) # sys.path.append(os.path.dirname(str(context.presentation.location))) except KeyError: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cb581d51/requirements.in ---------------------------------------------------------------------- diff --git a/requirements.in b/requirements.in index a659a2a..2c7978f 100644 --- a/requirements.in +++ b/requirements.in @@ -25,7 +25,7 @@ SQLAlchemy>=1.1.0, <1.2 # version 1.2 dropped support of python 2.6 wagon==0.6.0 bottle>=0.12.0, <0.13 Fabric>=1.13.0, <1.14 -click==4.0 +click==4.1 colorama==0.3.3 PrettyTable>=0.7,<0.8 click_didyoumean==0.0.3 http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cb581d51/tests/utils/test_threading.py ---------------------------------------------------------------------- diff --git a/tests/utils/test_threading.py b/tests/utils/test_threading.py index 787cf5e..39ce717 100644 --- a/tests/utils/test_threading.py +++ b/tests/utils/test_threading.py @@ -16,7 +16,7 @@ import pytest -from aria.utils.threading import ExcThread +from aria.utils import threading class TestPluginManager(object): @@ -26,7 +26,7 @@ class TestPluginManager(object): def error_raising_func(): raise ValueError('This is an error') - thread = ExcThread(target=error_raising_func) + thread = threading.ExceptionThread(target=error_raising_func) thread.start() thread.join()
