diff options
Diffstat (limited to 'yardstick/tests/unit/common')
| -rw-r--r-- | yardstick/tests/unit/common/test_packages.py | 88 | ||||
| -rw-r--r-- | yardstick/tests/unit/common/test_utils.py | 38 |
2 files changed, 19 insertions, 107 deletions
diff --git a/yardstick/tests/unit/common/test_packages.py b/yardstick/tests/unit/common/test_packages.py deleted file mode 100644 index ba59a3015..000000000 --- a/yardstick/tests/unit/common/test_packages.py +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright (c) 2018 Intel Corporation -# -# 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 -from pip import exceptions as pip_exceptions -from pip.operations import freeze -import unittest - -from yardstick.common import packages - - -class PipExecuteActionTestCase(unittest.TestCase): - - def setUp(self): - self._mock_pip_main = mock.patch.object(packages, '_pip_main') - self.mock_pip_main = self._mock_pip_main.start() - self.mock_pip_main.return_value = 0 - self._mock_freeze = mock.patch.object(freeze, 'freeze') - self.mock_freeze = self._mock_freeze.start() - self.addCleanup(self._cleanup) - - def _cleanup(self): - self._mock_pip_main.stop() - self._mock_freeze.stop() - - def test_pip_execute_action(self): - self.assertEqual(0, packages._pip_execute_action('test_package')) - - def test_remove(self): - self.assertEqual(0, packages._pip_execute_action('test_package', - action='uninstall')) - - def test_install(self): - self.assertEqual(0, packages._pip_execute_action( - 'test_package', action='install', target='temp_dir')) - - def test_pip_execute_action_error(self): - self.mock_pip_main.return_value = 1 - self.assertEqual(1, packages._pip_execute_action('test_package')) - - def test_pip_execute_action_exception(self): - self.mock_pip_main.side_effect = pip_exceptions.PipError - self.assertEqual(1, packages._pip_execute_action('test_package')) - - def test_pip_list(self): - pkg_input = [ - 'XStatic-Rickshaw==1.5.0.0', - 'xvfbwrapper==0.2.9', - '-e git+https://git.opnfv.org/yardstick@50773a24afc02c9652b662ecca' - '2fc5621ea6097a#egg=yardstick', - 'zope.interface==4.4.3' - ] - pkg_dict = { - 'XStatic-Rickshaw': '1.5.0.0', - 'xvfbwrapper': '0.2.9', - 'yardstick': '50773a24afc02c9652b662ecca2fc5621ea6097a', - 'zope.interface': '4.4.3' - } - self.mock_freeze.return_value = pkg_input - - pkg_output = packages.pip_list() - for pkg_name, pkg_version in pkg_output.items(): - self.assertEqual(pkg_dict.get(pkg_name), pkg_version) - - def test_pip_list_single_package(self): - pkg_input = [ - 'XStatic-Rickshaw==1.5.0.0', - 'xvfbwrapper==0.2.9', - '-e git+https://git.opnfv.org/yardstick@50773a24afc02c9652b662ecca' - '2fc5621ea6097a#egg=yardstick', - 'zope.interface==4.4.3' - ] - self.mock_freeze.return_value = pkg_input - - pkg_output = packages.pip_list(pkg_name='xvfbwrapper') - self.assertEqual(1, len(pkg_output)) - self.assertEqual(pkg_output.get('xvfbwrapper'), '0.2.9') diff --git a/yardstick/tests/unit/common/test_utils.py b/yardstick/tests/unit/common/test_utils.py index e71d0ff0f..9540a39e8 100644 --- a/yardstick/tests/unit/common/test_utils.py +++ b/yardstick/tests/unit/common/test_utils.py @@ -305,8 +305,8 @@ power management: """ socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo) - assert sorted(socket_map.keys()) == [0] - assert sorted(socket_map[0].keys()) == [2, 3, 4] + self.assertEqual(sorted(socket_map.keys()), [0]) + self.assertEqual(sorted(socket_map[0].keys()), [2, 3, 4]) def test_single_socket_hyperthread(self): cpuinfo = """\ @@ -393,11 +393,11 @@ power management: """ 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] - assert sorted(socket_map[0][2]) == [6] - assert sorted(socket_map[0][3]) == [7] + self.assertEqual(sorted(socket_map.keys()), [0]) + self.assertEqual(sorted(socket_map[0].keys()), [1, 2, 3]) + self.assertEqual(sorted(socket_map[0][1]), [5]) + self.assertEqual(sorted(socket_map[0][2]), [6]) + self.assertEqual(sorted(socket_map[0][3]), [7]) def test_dual_socket_hyperthread(self): cpuinfo = """\ @@ -592,15 +592,15 @@ power management: """ 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] - assert sorted(socket_map[0][0]) == [44] - assert sorted(socket_map[0][1]) == [1] - assert sorted(socket_map[0][2]) == [2] - assert sorted(socket_map[1][26]) == [85] - assert sorted(socket_map[1][27]) == [86] - assert sorted(socket_map[1][28]) == [43, 87] + self.assertEqual(sorted(socket_map.keys()), [0, 1]) + self.assertEqual(sorted(socket_map[0].keys()), [0, 1, 2]) + self.assertEqual(sorted(socket_map[1].keys()), [26, 27, 28]) + self.assertEqual(sorted(socket_map[0][0]), [44]) + self.assertEqual(sorted(socket_map[0][1]), [1]) + self.assertEqual(sorted(socket_map[0][2]), [2]) + self.assertEqual(sorted(socket_map[1][26]), [85]) + self.assertEqual(sorted(socket_map[1][27]), [86]) + self.assertEqual(sorted(socket_map[1][28]), [43, 87]) def test_dual_socket_no_hyperthread(self): cpuinfo = """\ @@ -796,11 +796,11 @@ power management: """ socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo) processors = socket_map.processors() - assert processors == [1, 2, 43, 44, 85, 86, 87] + self.assertEqual(processors, [1, 2, 43, 44, 85, 86, 87]) cores = socket_map.cores() - assert cores == [0, 1, 2, 26, 27, 28] + self.assertEqual(cores, [0, 1, 2, 26, 27, 28]) sockets = socket_map.sockets() - assert sockets == [0, 1] + self.assertEqual(sockets, [0, 1]) class ChangeObjToDictTestCase(unittest.TestCase): |