openstack/heat-translator
Code Issues Proposed changes

Merge "Update temporary URLs to github URLs"

Browse Source
This commit is contained in:
Jenkins 2015-10-02 16:59:09 +00:00 committed by Gerrit Code Review
commit 28382b87fd
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
translator/tests/test_tosca_hot_translation.py
View File

@ -344,8 +344,10 @@ class ToscaHotTranslationTest(TestCase):
json.dumps(diff, indent=4, separators=(', ', ': '))) json.dumps(diff, indent=4, separators=(', ', ': ')))
def test_hot_translate_template_by_url_with_local_abspath_import(self): def test_hot_translate_template_by_url_with_local_abspath_import(self):
tosca_file = 'https://ibm.box.com/shared/static/' \ tosca_file = 'https://raw.githubusercontent.com/openstack/' \
'lrgdktp9vw3991y2hlogmghwwvnok3lu.yaml' 'heat-translator/master/translator/tests/data/' \
'tosca_single_instance_wordpress_with_local_abspath' \
'_import.yaml'
hot_file = '../tests/data/hot_output/' \ hot_file = '../tests/data/hot_output/' \
'hot_single_instance_wordpress.yaml' 'hot_single_instance_wordpress.yaml'
params = {'db_name': 'wordpress', params = {'db_name': 'wordpress',
@ -361,13 +363,15 @@ class ToscaHotTranslationTest(TestCase):
tosca_file, hot_file, params) tosca_file, hot_file, params)
self.assertEqual( self.assertEqual(
'Absolute file name /tmp/wordpress.yaml cannot be used for a ' 'Absolute file name /tmp/wordpress.yaml cannot be used for a '
'URL-based input https://ibm.box.com/shared/static/' 'URL-based input https://raw.githubusercontent.com/openstack/'
'lrgdktp9vw3991y2hlogmghwwvnok3lu.yaml template.', 'heat-translator/master/translator/tests/data/tosca_single_'
'instance_wordpress_with_local_abspath_import.yaml template.',
err.__str__()) err.__str__())
def test_hot_translate_template_by_url_with_url_import(self): def test_hot_translate_template_by_url_with_url_import(self):
tosca_url = 'https://ibm.box.com/shared/static/' \ tosca_url = 'https://raw.githubusercontent.com/openstack/' \
'tocmxe9b9x7to0lj5ph9mx58d47ol77m.yaml' 'heat-translator/master/translator/tests/data/' \
'tosca_single_instance_wordpress_with_url_import.yaml'
hot_file = '../tests/data/hot_output/' \ hot_file = '../tests/data/hot_output/' \
'hot_single_instance_wordpress.yaml' 'hot_single_instance_wordpress.yaml'
params = {'db_name': 'wordpress', params = {'db_name': 'wordpress',
@ -408,8 +412,8 @@ class ToscaHotTranslationTest(TestCase):
json.dumps(diff, indent=4, separators=(', ', ': '))) json.dumps(diff, indent=4, separators=(', ', ': ')))
def test_translate_elk_csar_from_url(self): def test_translate_elk_csar_from_url(self):
tosca_file = 'https://ibm.box.com/shared/static/' \ tosca_file = 'https://github.com/openstack/heat-translator/raw/' \
'k9vtus4jes1epl7vfojbcscgsd80inzv.zip' 'master/translator/tests/data/csar_elk.zip'
hot_file = '../tests/data/hot_output/hot_elk_from_csar.yaml' hot_file = '../tests/data/hot_output/hot_elk_from_csar.yaml'
params = {'github_url': params = {'github_url':
'http://github.com/paypal/rest-api-sample-app-nodejs.git', 'http://github.com/paypal/rest-api-sample-app-nodejs.git',