From c8201c119ec686e79797721156767685fe848aca Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 7 Apr 2016 14:08:49 -0400 Subject: Update tosca lib to version 0.5 Use tosca-parser and heat-translator to analyze to the basic nfv-tosca type definitions, and use simple tosca new feature such as policy, group and trigger, which are now supported by the latest version of tosca-parser and heat-translator. JIRA:PARSER-18 Change-Id: I797bcacbb5b32005d0aeb0f3f32851ac96e30f01 Signed--off-by: shangxdy Signed-off-by: shangxdy --- .../toscaparser/tests/test_utils.py | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/test_utils.py (limited to 'tosca2heat/tosca-parser-0.3.0/toscaparser/tests/test_utils.py') diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/test_utils.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/test_utils.py deleted file mode 100644 index a0c8a6d..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/test_utils.py +++ /dev/null @@ -1,60 +0,0 @@ -# Licensed 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. - -from toscaparser.common.exception import URLException -from toscaparser.tests.base import TestCase -from toscaparser.utils.gettextutils import _ -import toscaparser.utils.urlutils -import toscaparser.utils.yamlparser - -YAML_LOADER = toscaparser.utils.yamlparser.load_yaml - - -class UrlUtilsTest(TestCase): - - url_utils = toscaparser.utils.urlutils.UrlUtils - - def test_urlutils_validate_url(self): - self.assertTrue(self.url_utils.validate_url("http://www.github.com/")) - self.assertTrue( - self.url_utils.validate_url("https://github.com:81/a/2/a.b")) - self.assertTrue(self.url_utils.validate_url("ftp://github.com")) - self.assertFalse(self.url_utils.validate_url("github.com")) - self.assertFalse(self.url_utils.validate_url("123")) - self.assertFalse(self.url_utils.validate_url("a/b/c")) - - def test_urlutils_join_url(self): - self.assertEqual( - self.url_utils.join_url("http://github.com/proj1", "proj2"), - "http://github.com/proj2") - self.assertEqual( - self.url_utils.join_url("http://github.com/proj1/scripts/a.js", - "b.js"), - "http://github.com/proj1/scripts/b.js") - self.assertEqual( - self.url_utils.join_url("http://github.com/proj1/scripts", "b.js"), - "http://github.com/proj1/b.js") - self.assertEqual( - self.url_utils.join_url("http://github.com/proj1/scripts", - "scripts/b.js"), - "http://github.com/proj1/scripts/b.js") - - def test_load_url_errors(self): - url = "http://www.badurl." - err_msg = (_('Failed to reach server "%(url)s". Reason is: ' - '[Errno -2] Name or service not known.') - % {'url': url}) - err = self.assertRaises(URLException, - YAML_LOADER, - url, - False) - self.assertEqual(err_msg, err.__str__()) -- cgit 1.2.3-korg