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 --- .../translator/tests/test_conf.py | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/tests/test_conf.py (limited to 'tosca2heat/heat-translator-0.3.0/translator/tests/test_conf.py') diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/test_conf.py b/tosca2heat/heat-translator-0.3.0/translator/tests/test_conf.py deleted file mode 100644 index 6506c27..0000000 --- a/tosca2heat/heat-translator-0.3.0/translator/tests/test_conf.py +++ /dev/null @@ -1,57 +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. - -import mock -import os - -from translator.conf.config import ConfigProvider as translatorConfig -from translator.tests.base import TestCase - - -def reload_config(func): - '''Decorator to reload config. - - Set to default values defined in translator.conf file - - ''' - - def reload(*args): - func(*args) - path = os.path.dirname(os.path.abspath(__file__)) + '/../conf/' - conf_file = os.path.join(path, 'translator.conf') - translatorConfig._load_config(conf_file) - - return reload - - -class ConfTest(TestCase): - - @reload_config - @mock.patch('six.moves.configparser.ConfigParser') - def test_load_config(self, mock_config_parser): - translatorConfig._translator_config.read = mock.MagicMock() - translatorConfig._load_config('fake_file.conf') - self.assertTrue(translatorConfig._translator_config.read.called) - - def test_get_value(self): - ret_value = mock.MagicMock(return_value='hot') - translatorConfig._translator_config.get = ret_value - value = translatorConfig.get_value('DEFAULT', 'language') - self.assertTrue(translatorConfig._translator_config.get.called) - self.assertEqual(value, 'hot') - - def test_get_all_values(self): - ret_value = mock.MagicMock(return_value=['hot']) - translatorConfig._translator_config.items = ret_value - values = translatorConfig.get_all_values() - self.assertTrue(translatorConfig._translator_config.items.called) - self.assertEqual(values[0], 'hot') -- cgit 1.2.3-korg