This is an automated email from the ASF dual-hosted git repository. mxmrlv pushed a commit to branch ARIA-422-Parsing-CSARs-is-broken in repository https://gitbox.apache.org/repos/asf/incubator-ariatosca.git
commit 0deebc5f2563f36f03b1c90652ce1e52b67c57fb Author: max-orlov <ma...@gigaspaces.com> AuthorDate: Mon Dec 4 16:10:25 2017 +0200 ARIA-422 Parsing CSARs is broken --- aria/utils/yaml.py | 4 ++++ tests/cli/csar.py | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/aria/utils/yaml.py b/aria/utils/yaml.py index 4c9c557..0bf58a7 100644 --- a/aria/utils/yaml.py +++ b/aria/utils/yaml.py @@ -48,3 +48,7 @@ except ImportError: finally: from ruamel import yaml # pylint: disable=unused-import + + +# Enables support for writing python unicode class with yaml +yaml.SafeLoader.add_constructor('tag:yaml.org,2002:python/unicode', lambda _, node: node.value) diff --git a/tests/cli/csar.py b/tests/cli/csar.py new file mode 100644 index 0000000..ab8e919 --- /dev/null +++ b/tests/cli/csar.py @@ -0,0 +1,37 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import os + +from aria.cli import csar +from ..helpers import get_resource_uri + + +def _create_archive(tmpdir, mocker): + service_template_dir = get_resource_uri(os.path.join( + 'service-templates', 'tosca-simple-1.0', 'node-cellar', 'node-cellar.yaml')) + csar_path = str(tmpdir.join('csar_archive.csar')) + csar.write(service_template_dir, csar_path, mocker.MagicMock()) + return csar_path + + +def test_create_csar(tmpdir, mocker): + csar_path = _create_archive(tmpdir, mocker) + assert os.path.exists(csar_path) + + +def test_read_csar(tmpdir, mocker): + csar_path = _create_archive(tmpdir, mocker) + csar_reader = csar.read(csar_path) + assert csar_reader -- To stop receiving notification emails like this one, please contact "comm...@ariatosca.apache.org" <comm...@ariatosca.apache.org>.