From ba4e9e6e47bd10ecc803bab920178ea973c2fa86 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 29 Nov 2017 22:56:21 +0000 Subject: Move tests: unit/benchmark * Fix pylint errors * Add TODOs Some errors are ignored locally, as they were a symptom of other problems. These issues have been flagged with a TODO, and should be fixed later. Change-Id: I30eb4b0aafe0575d0cddbc946108291f21a98ed8 Jira: YARDSTICK-837 Signed-off-by: Emma Foley Signed-off-by: Ross Brattain --- .../scenarios/lib/test_create_floating_ip.py | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py (limited to 'tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py') diff --git a/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py b/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py deleted file mode 100644 index a7286f5da..000000000 --- a/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import unittest -import mock - -from yardstick.benchmark.scenarios.lib import create_floating_ip -import yardstick.common.openstack_utils as op_utils - - -class CreateFloatingIpTestCase(unittest.TestCase): - - def setUp(self): - self._mock_get_network_id = mock.patch.object( - op_utils, 'get_network_id') - self.mock_get_network_id = self._mock_get_network_id.start() - self._mock_create_floating_ip = mock.patch.object( - op_utils, 'create_floating_ip') - self.mock_create_floating_ip = self._mock_create_floating_ip.start() - self._mock_get_neutron_client = mock.patch.object( - op_utils, 'get_neutron_client') - self.mock_get_neutron_client = self._mock_get_neutron_client.start() - self._mock_get_shade_client = mock.patch.object( - op_utils, 'get_shade_client') - self.mock_get_shade_client = self._mock_get_shade_client.start() - self._mock_log = mock.patch.object(create_floating_ip, 'LOG') - self.mock_log = self._mock_log.start() - - self._fip_obj = create_floating_ip.CreateFloatingIp(mock.ANY, mock.ANY) - self._fip_obj.scenario_cfg = {'output': 'key1\nkey2'} - - self.addCleanup(self._stop_mock) - - def _stop_mock(self): - self._mock_get_network_id.stop() - self._mock_create_floating_ip.stop() - self._mock_get_neutron_client.stop() - self._mock_get_shade_client.stop() - self._mock_log.stop() - - def test_run(self): - self.mock_create_floating_ip.return_value = {'fip_id': 'value1', - 'fip_addr': 'value2'} - output = self._fip_obj.run(mock.ANY) - self.assertDictEqual({'key1': 'value1', 'key2': 'value2'}, output) - - def test_run_no_fip(self): - self.mock_create_floating_ip.return_value = None - output = self._fip_obj.run(mock.ANY) - self.assertIsNone(output) - self.mock_log.error.assert_called_once_with( - 'Creating floating ip failed!') -- cgit 1.2.3-korg