Merge pull request #218 from tnadeauaria/master
ARIA-430 Typo in error message during CSAR creation
diff --git a/aria/utils/yaml.py b/aria/utils/yaml.py
index 4c9c557..86f7f5b 100644
--- a/aria/utils/yaml.py
+++ b/aria/utils/yaml.py
@@ -48,3 +48,9 @@
finally:
from ruamel import yaml # pylint: disable=unused-import
+
+
+# Enables support for writing Python Unicode class with YAML. This is a temporary fix which
+# should be replaced by a proper usage of ruamel
+# (addressed in https://issues.apache.org/jira/browse/ARIA-429).
+yaml.SafeLoader.add_constructor('tag:yaml.org,2002:python/unicode', lambda _, node: node.value)
diff --git a/release/asf-release.sh b/release/asf-release.sh
index 18f5b38..6b09543 100755
--- a/release/asf-release.sh
+++ b/release/asf-release.sh
@@ -135,7 +135,7 @@
echo "Signing archive ${ARCHIVE_NAME}..."
gpg --armor --output ${ARCHIVE_NAME}.asc --detach-sig ${ARCHIVE_NAME}
gpg --print-md MD5 ${ARCHIVE_NAME} > ${ARCHIVE_NAME}.md5
- gpg --print-md SHA512 ${ARCHIVE_NAME} > ${ARCHIVE_NAME}.sha
+ gpg --print-md SHA512 ${ARCHIVE_NAME} > ${ARCHIVE_NAME}.sha512
}
@@ -227,23 +227,9 @@
echo "Publishing to Apache dist..."
- local TMP_DIR=$(mktemp -d)
- echo "Checking out ARIA dist dev to ${TMP_DIR}"
- pushd ${TMP_DIR}
-
- svn co https://dist.apache.org/repos/dist/dev/incubator/ariatosca/ ariatosca-dev
- svn co https://dist.apache.org/repos/dist/release/incubator/ariatosca/ ariatosca-release
- cp -r ariatosca-dev/${RELEASE_DIR} ariatosca-release
-
- pushd ariatosca-release
- svn add ${RELEASE_DIR}
- # TODO: remove older releases?
- svn commit -m "ARIA ${VERSION} release"
- popd
- popd
+ svn mv https://dist.apache.org/repos/dist/dev/incubator/ariatosca/${RELEASE_DIR} https://dist.apache.org/repos/dist/release/incubator/ariatosca/${RELEASE_DIR} -m "ARIATOSCA ${VERSION} publish"
}
-
function _create_git_tag {
local VERSION=$1
diff --git a/tests/cli/csar.py b/tests/cli/csar.py
new file mode 100644
index 0000000..3bbe4ad
--- /dev/null
+++ b/tests/cli/csar.py
@@ -0,0 +1,38 @@
+# 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
