Repository: incubator-ariatosca Updated Branches: refs/heads/runtime_props_to_attr 11e28592b -> 6a742d2ee
another test_ssh fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/6a742d2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/6a742d2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/6a742d2e Branch: refs/heads/runtime_props_to_attr Commit: 6a742d2ee9cd66338bb16e40bc210bd4a9141f4a Parents: 11e2859 Author: max-orlov <[email protected]> Authored: Tue May 16 21:51:51 2017 +0300 Committer: max-orlov <[email protected]> Committed: Tue May 16 21:51:51 2017 +0300 ---------------------------------------------------------------------- tests/orchestrator/execution_plugin/test_ssh.py | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6a742d2e/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 e83a779..01a32bb 100644 --- a/tests/orchestrator/execution_plugin/test_ssh.py +++ b/tests/orchestrator/execution_plugin/test_ssh.py @@ -55,7 +55,7 @@ class TestWithActualSSHServer(object): def test_run_script_basic(self): expected_attribute_value = 'some_value' props = self._execute(env={'test_value': expected_attribute_value}) - assert props['test_value'] == expected_attribute_value + assert props['test_value'].value == expected_attribute_value @pytest.mark.skip(reason='sudo privileges are required') def test_run_script_as_sudo(self): @@ -66,7 +66,7 @@ class TestWithActualSSHServer(object): def test_run_script_default_base_dir(self): props = self._execute() - assert props['work_dir'] == '{0}/work'.format(constants.DEFAULT_BASE_DIR) + assert props['work_dir'].value == '{0}/work'.format(constants.DEFAULT_BASE_DIR) @pytest.mark.skip(reason='Re-enable once output from process executor can be captured') @pytest.mark.parametrize('hide_groups', [[], ['everything']]) @@ -93,16 +93,16 @@ class TestWithActualSSHServer(object): 'cwd': expected_cwd, 'base_dir': expected_base_dir }) - assert props['env_value'] == expected_env_value + assert props['env_value'].value == expected_env_value assert len(props['bash_version']) > 0 - assert props['arg1_value'] == expected_arg1_value - assert props['arg2_value'] == expected_arg2_value - assert props['cwd'] == expected_cwd - assert props['ctx_path'] == '{0}/ctx'.format(expected_base_dir) + assert props['arg1_value'].value == expected_arg1_value + assert props['arg2_value'].value == expected_arg2_value + assert props['cwd'].value == expected_cwd + assert props['ctx_path'].value == '{0}/ctx'.format(expected_base_dir) def test_run_script_command_prefix(self): props = self._execute(process={'command_prefix': 'bash -i'}) - assert 'i' in props['dollar_dash'] + assert 'i' in props['dollar_dash'].value def test_run_script_reuse_existing_ctx(self): expected_test_value_1 = 'test_value_1' @@ -112,27 +112,27 @@ class TestWithActualSSHServer(object): '{0}_2'.format(self.test_name)], env={'test_value1': expected_test_value_1, 'test_value2': expected_test_value_2}) - assert props['test_value1'] == expected_test_value_1 - assert props['test_value2'] == expected_test_value_2 + assert props['test_value1'].value == expected_test_value_1 + assert props['test_value2'].value == expected_test_value_2 def test_run_script_download_resource_plain(self, tmpdir): resource = tmpdir.join('resource') resource.write('content') self._upload(str(resource), 'test_resource') props = self._execute() - assert props['test_value'] == 'content' + assert props['test_value'].value == 'content' def test_run_script_download_resource_and_render(self, tmpdir): resource = tmpdir.join('resource') resource.write('{{ctx.service.name}}') self._upload(str(resource), 'test_resource') props = self._execute() - assert props['test_value'] == self._workflow_context.service.name + assert props['test_value'].value == self._workflow_context.service.name @pytest.mark.parametrize('value', ['string-value', [1, 2, 3], {'key': 'value'}]) def test_run_script_inputs_as_env_variables_no_override(self, value): props = self._execute(custom_input=value) - return_value = props['test_value'] + return_value = props['test_value'].value expected = return_value if isinstance(value, basestring) else json.loads(return_value) assert value == expected @@ -140,7 +140,7 @@ class TestWithActualSSHServer(object): def test_run_script_inputs_as_env_variables_process_env_override(self, value): props = self._execute(custom_input='custom-input-value', env={'custom_env_var': value}) - return_value = props['test_value'] + return_value = props['test_value'].value expected = return_value if isinstance(value, basestring) else json.loads(return_value) assert value == expected
