Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-48-aria-cli e1b682b2e -> 402eeb451
fixed ssh tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/402eeb45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/402eeb45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/402eeb45 Branch: refs/heads/ARIA-48-aria-cli Commit: 402eeb45113b5ee873262dabe9e6f5812d5cac2d Parents: e1b682b Author: Ran Ziv <r...@gigaspaces.com> Authored: Thu Apr 13 11:39:16 2017 +0300 Committer: Ran Ziv <r...@gigaspaces.com> Committed: Thu Apr 13 11:39:16 2017 +0300 ---------------------------------------------------------------------- tests/orchestrator/execution_plugin/test_ssh.py | 44 ++++++++++++-------- 1 file changed, 27 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/402eeb45/tests/orchestrator/execution_plugin/test_ssh.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/execution_plugin/test_ssh.py b/tests/orchestrator/execution_plugin/test_ssh.py index d17def1..5305d00 100644 --- a/tests/orchestrator/execution_plugin/test_ssh.py +++ b/tests/orchestrator/execution_plugin/test_ssh.py @@ -217,29 +217,39 @@ class TestWithActualSSHServer(object): @workflow def mock_workflow(ctx, graph): node = ctx.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME) + inputs = { + 'script_path': script_path, + 'fabric_env': _FABRIC_ENV, + 'process': process, + 'use_sudo': use_sudo, + 'hide_output': hide_output, + 'custom_env_var': custom_input, + 'test_operation': '', + 'commands': commands + } interface = mock.models.create_interface( node.service, 'test', 'op', - operation_kwargs=dict(implementation='{0}.{1}'.format( - operations.__name__, - operation.__name__)) + operation_kwargs=dict( + implementation='{0}.{1}'.format( + operations.__name__, + operation.__name__), + inputs=inputs) ) node.interfaces[interface.name] = interface - graph.sequence(*[api.task.OperationTask.for_node( - node=node, - interface_name='test', - operation_name='op', - inputs={ - 'script_path': script_path, - 'fabric_env': _FABRIC_ENV, - 'process': process, - 'use_sudo': use_sudo, - 'hide_output': hide_output, - 'custom_env_var': custom_input, - 'test_operation': test_operation, - 'commands': commands - }) for test_operation in test_operations]) + + ops = [] + for test_operation in test_operations: + op_inputs = inputs.copy() + op_inputs['test_operation'] = test_operation + ops.append(api.task.OperationTask.for_node( + node=node, + interface_name='test', + operation_name='op', + inputs=op_inputs)) + + graph.sequence(*ops) return graph tasks_graph = mock_workflow(ctx=self._workflow_context) # pylint: disable=no-value-for-parameter eng = engine.Engine(