diff options
Diffstat (limited to 'tests/unit/common')
| -rw-r--r-- | tests/unit/common/test_utils.py | 43 | ||||
| -rw-r--r-- | tests/unit/common/test_yaml_loader.py | 32 |
2 files changed, 43 insertions, 32 deletions
diff --git a/tests/unit/common/test_utils.py b/tests/unit/common/test_utils.py index f25e6cc07..923ec4aaa 100644 --- a/tests/unit/common/test_utils.py +++ b/tests/unit/common/test_utils.py @@ -20,6 +20,7 @@ from itertools import product, chain import mock from six.moves import configparser +import yardstick from yardstick.common import utils from yardstick.common import constants @@ -45,47 +46,25 @@ class IterSubclassesTestCase(unittest.TestCase): self.assertEqual([B, C, D], list(utils.itersubclasses(A))) -class TryAppendModuleTestCase(unittest.TestCase): - - @mock.patch('yardstick.common.utils.importutils') - def test_try_append_module_not_in_modules(self, mock_importutils): - - modules = {} - name = 'foo' - utils.try_append_module(name, modules) - mock_importutils.import_module.assert_called_with(name) - - @mock.patch('yardstick.common.utils.importutils') - def test_try_append_module_already_in_modules(self, mock_importutils): - - modules = {'foo'} - name = 'foo' - utils.try_append_module(name, modules) - self.assertFalse(mock_importutils.import_module.called) - - class ImportModulesFromPackageTestCase(unittest.TestCase): @mock.patch('yardstick.common.utils.os.walk') - @mock.patch('yardstick.common.utils.try_append_module') - def test_import_modules_from_package_no_mod(self, mock_append, mock_walk): - - sep = os.sep + def test_import_modules_from_package_no_mod(self, mock_walk): + yardstick_root = os.path.dirname(os.path.dirname(yardstick.__file__)) mock_walk.return_value = ([ - ('..' + sep + 'foo', ['bar'], ['__init__.py']), - ('..' + sep + 'foo' + sep + 'bar', [], ['baz.txt', 'qux.rst']) + (os.path.join(yardstick_root, 'foo'), ['bar'], ['__init__.py']), + (os.path.join(yardstick_root, 'foo', 'bar'), [], ['baz.txt', 'qux.rst']) ]) utils.import_modules_from_package('foo.bar') - self.assertFalse(mock_append.called) @mock.patch('yardstick.common.utils.os.walk') @mock.patch('yardstick.common.utils.importutils') def test_import_modules_from_package(self, mock_importutils, mock_walk): - sep = os.sep + yardstick_root = os.path.dirname(os.path.dirname(yardstick.__file__)) mock_walk.return_value = ([ - ('foo' + sep + '..' + sep + 'bar', [], ['baz.py']) + (os.path.join(yardstick_root, 'foo', os.pardir, 'bar'), [], ['baz.py']) ]) utils.import_modules_from_package('foo.bar') @@ -268,7 +247,7 @@ address sizes : 46 bits physical, 48 bits virtual power management: """ - socket_map = utils.parse_cpuinfo(cpuinfo) + socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo) assert sorted(socket_map.keys()) == [0] assert sorted(socket_map[0].keys()) == [2, 3, 4] @@ -356,7 +335,7 @@ address sizes : 39 bits physical, 48 bits virtual power management: """ - socket_map = utils.parse_cpuinfo(cpuinfo) + socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo) assert sorted(socket_map.keys()) == [0] assert sorted(socket_map[0].keys()) == [1, 2, 3] assert sorted(socket_map[0][1]) == [5] @@ -555,7 +534,7 @@ address sizes : 46 bits physical, 48 bits virtual power management: """ - socket_map = utils.parse_cpuinfo(cpuinfo) + socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo) assert sorted(socket_map.keys()) == [0, 1] assert sorted(socket_map[0].keys()) == [0, 1, 2] assert sorted(socket_map[1].keys()) == [26, 27, 28] @@ -758,7 +737,7 @@ address sizes : 46 bits physical, 48 bits virtual power management: """ - socket_map = utils.parse_cpuinfo(cpuinfo) + socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo) processors = socket_map.processors() assert processors == [1, 2, 43, 44, 85, 86, 87] cores = socket_map.cores() diff --git a/tests/unit/common/test_yaml_loader.py b/tests/unit/common/test_yaml_loader.py new file mode 100644 index 000000000..90cbb8157 --- /dev/null +++ b/tests/unit/common/test_yaml_loader.py @@ -0,0 +1,32 @@ +# 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. + +# yardstick: this file is copied from python-heatclient and slightly modified + +from __future__ import absolute_import +import unittest + +from yardstick.common import yaml_loader + + +class TemplateFormatTestCase(unittest.TestCase): + + def test_parse_to_value_exception(self): + + self.assertEquals(yaml_loader.yaml_load("string"), u"string") + + +def main(): + unittest.main() + +if __name__ == '__main__': + main() |