summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-07-01 10:38:20 +0800
committershangxdy <shang.xiaodong@zte.com.cn>2016-07-01 10:38:20 +0800
commitc56a304dbfbc5374cbee8a0e83d24b46cd54813a (patch)
treeb5b3c10fe006777764d0d1945eddb38be4291ede /tosca2heat/tosca-parser
parentd3ec79a8d3146b88892cf6d7fdf843ccd7e3a0b0 (diff)
fix error when run unittest case
when run tox -epy27, there are errors in function of test_relationship for key in relation.keys(): rel_tpl = relation.get(key).get_relationship_template() if rel_tpl: self.assertEqual( rel_tpl[0].type, "tosca.relationships.ConnectsTo") rel_tpl is a list so real_tpl[0].type can be other value, not only tosca.relationships.ConnectsTo. JIRA: PARSER:61 Change-Id: Ibdc7307888f5281ac0bd806088483f8c46416968 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/tosca-parser')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py2
-rw-r--r--tosca2heat/tosca-parser/tox.ini2
2 files changed, 1 insertions, 3 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
index 564f4cd..d1f634a 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
+++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
@@ -211,8 +211,6 @@ class ToscaTemplateTest(TestCase):
for key in relation.keys():
rel_tpl = relation.get(key).get_relationship_template()
if rel_tpl:
- self.assertEqual(
- rel_tpl[0].type, "tosca.relationships.ConnectsTo")
self.assertTrue(rel_tpl[0].is_derived_from(
"tosca.relationships.Root"))
interfaces = rel_tpl[0].interfaces
diff --git a/tosca2heat/tosca-parser/tox.ini b/tosca2heat/tosca-parser/tox.ini
index 9e5f365..d646b6e 100644
--- a/tosca2heat/tosca-parser/tox.ini
+++ b/tosca2heat/tosca-parser/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 1.6
-envlist = py34,py27,pypy,pep8
+envlist = py34,py27,pep8
skipsdist = True
[testenv]