openstack
/
heat-translator
Code Issues Proposed changes

Reenable disabled tests. 

Change-Id: Ica78ae927d06b3ed7f72ccba9a19ceb76872585d
Signed-off-by: Mathieu Velten <mathieu.velten@cern.ch>
This commit is contained in:
Mathieu Velten 2016-02-26 09:55:26 +01:00
parent 5db995c190
commit 02d0528576
2 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
translator/osc/v1/tests/test_translate.py
View File

@ -318,20 +318,20 @@ class TestTranslateTemplate(testtools.TestCase):
'cpus': 8}
self._check_success(tosca_file, hot_file, params)
# def test_osc_translate_template_by_url_with_local_import(self):
# tosca_file = ("https://raw.githubusercontent.com/openstack/" +
# "heat-translator/master/translator/tests/data/" +
# "tosca_single_instance_wordpress.yaml")
# hot_file = utils.get_template_path(
# "hot_output/" +
# "hot_single_instance_wordpress.yaml")
# params = {'db_name': 'wordpress',
# 'db_user': 'wp_user',
# 'db_pwd': 'wp_pass',
# 'db_root_pwd': 'passw0rd',
# 'db_port': 3366,
# 'cpus': 8}
# self._check_success(tosca_file, hot_file, params)
def test_osc_translate_template_by_url_with_local_import(self):
tosca_file = ("https://raw.githubusercontent.com/openstack/" +
"heat-translator/master/translator/tests/data/" +
"tosca_single_instance_wordpress.yaml")
hot_file = utils.get_template_path(
"hot_output/" +
"hot_single_instance_wordpress.yaml")
params = {'db_name': 'wordpress',
'db_user': 'wp_user',
'db_pwd': 'wp_pass',
'db_root_pwd': 'passw0rd',
'db_port': 3366,
'cpus': 8}
self._check_success(tosca_file, hot_file, params)
def test_osc_translate_template_by_url_with_local_abspath_import(self):
tosca_file = ("https://raw.githubusercontent.com/openstack/" +
@ -356,20 +356,20 @@ class TestTranslateTemplate(testtools.TestCase):
self._check_error(tosca_file, hot_file, params, ValidationError,
expected_msg, ImportError)
# def test_osc_translate_template_by_url_with_url_import(self):
# tosca_url = ("https://raw.githubusercontent.com/openstack/" +
# "heat-translator/master/translator/tests/data/" +
# "tosca_single_instance_wordpress_with_url_import.yaml")
# hot_file = utils.get_template_path(
# "hot_output/" +
# "hot_single_instance_wordpress.yaml")
# params = {'db_name': 'wordpress',
# 'db_user': 'wp_user',
# 'db_pwd': 'wp_pass',
# 'db_root_pwd': 'passw0rd',
# 'db_port': 3366,
# 'cpus': 8}
# self._check_success(tosca_url, hot_file, params)
def test_osc_translate_template_by_url_with_url_import(self):
tosca_url = ("https://raw.githubusercontent.com/openstack/" +
"heat-translator/master/translator/tests/data/" +
"tosca_single_instance_wordpress_with_url_import.yaml")
hot_file = utils.get_template_path(
"hot_output/" +
"hot_single_instance_wordpress.yaml")
params = {'db_name': 'wordpress',
'db_user': 'wp_user',
'db_pwd': 'wp_pass',
'db_root_pwd': 'passw0rd',
'db_port': 3366,
'cpus': 8}
self._check_success(tosca_url, hot_file, params)
def test_osc_translate_hello_world_csar(self):
tosca_file = utils.get_template_path("csar_hello_world.zip")

68
translator/tests/test_tosca_hot_translation.py
View File

@ -328,23 +328,23 @@ class ToscaHotTranslationTest(TestCase):
self.assertEqual({}, diff, '<difference> : ' +
json.dumps(diff, indent=4, separators=(', ', ': ')))
# def test_hot_translate_template_by_url_with_local_import(self):
# tosca_file = 'https://raw.githubusercontent.com/openstack/' \
# 'heat-translator/master/translator/tests/data/' \
# 'tosca_single_instance_wordpress.yaml'
# hot_file = '../tests/data/hot_output/' \
# 'hot_single_instance_wordpress.yaml'
# params = {'db_name': 'wordpress',
# 'db_user': 'wp_user',
# 'db_pwd': 'wp_pass',
# 'db_root_pwd': 'passw0rd',
# 'db_port': 3366,
# 'cpus': 8}
# diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
# hot_file,
# params)
# self.assertEqual({}, diff, '<difference> : ' +
# json.dumps(diff, indent=4, separators=(', ', ': ')))
def test_hot_translate_template_by_url_with_local_import(self):
tosca_file = 'https://raw.githubusercontent.com/openstack/' \
'heat-translator/master/translator/tests/data/' \
'tosca_single_instance_wordpress.yaml'
hot_file = '../tests/data/hot_output/' \
'hot_single_instance_wordpress.yaml'
params = {'db_name': 'wordpress',
'db_user': 'wp_user',
'db_pwd': 'wp_pass',
'db_root_pwd': 'passw0rd',
'db_port': 3366,
'cpus': 8}
diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
hot_file,
params)
self.assertEqual({}, diff, '<difference> : ' +
json.dumps(diff, indent=4, separators=(', ', ': ')))
def test_hot_translate_template_by_url_with_local_abspath_import(self):
tosca_file = 'https://raw.githubusercontent.com/openstack/' \
@ -371,23 +371,23 @@ class ToscaHotTranslationTest(TestCase):
'wordpress_with_local_abspath_import.yaml".')
ExceptionCollector.assertExceptionMessage(ImportError, expected_msg)
# def test_hot_translate_template_by_url_with_url_import(self):
# tosca_url = 'https://raw.githubusercontent.com/openstack/' \
# 'heat-translator/master/translator/tests/data/' \
# 'tosca_single_instance_wordpress_with_url_import.yaml'
# hot_file = '../tests/data/hot_output/' \
# 'hot_single_instance_wordpress.yaml'
# params = {'db_name': 'wordpress',
# 'db_user': 'wp_user',
# 'db_pwd': 'wp_pass',
# 'db_root_pwd': 'passw0rd',
# 'db_port': 3366,
# 'cpus': 8}
# diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_url,
# hot_file,
# params)
# self.assertEqual({}, diff, '<difference> : ' +
# json.dumps(diff, indent=4, separators=(', ', ': ')))
def test_hot_translate_template_by_url_with_url_import(self):
tosca_url = 'https://raw.githubusercontent.com/openstack/' \
'heat-translator/master/translator/tests/data/' \
'tosca_single_instance_wordpress_with_url_import.yaml'
hot_file = '../tests/data/hot_output/' \
'hot_single_instance_wordpress.yaml'
params = {'db_name': 'wordpress',
'db_user': 'wp_user',
'db_pwd': 'wp_pass',
'db_root_pwd': 'passw0rd',
'db_port': 3366,
'cpus': 8}
diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_url,
hot_file,
params)
self.assertEqual({}, diff, '<difference> : ' +
json.dumps(diff, indent=4, separators=(', ', ': ')))
def test_translate_hello_world_csar(self):
tosca_file = '../tests/data/csar_hello_world.zip'