diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2016-07-04 10:11:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-04 10:11:35 +0000 |
| commit | 28847dd54a22df5f55af71ebb46299162c78f49b (patch) | |
| tree | 845b1ced6a1e3663ffd259f7bc83f3353796f67a /tosca2heat | |
| parent | ff5fc2fc822ea6833e8291c129176b87e15dc2a9 (diff) | |
| parent | c56a304dbfbc5374cbee8a0e83d24b46cd54813a (diff) | |
Merge "fix error when run unittest case"
Diffstat (limited to 'tosca2heat')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py | 2 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/tox.ini | 2 |
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 752e5de..ac55059 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py +++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py @@ -224,8 +224,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] |