From 434713016ea45e04d5e314b24b5f9f184eb2edc2 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 2 Jan 2020 09:55:36 +0000 Subject: [PATCH 1/2] Fix unit tests for inspector py2 drop Ironic inspector has now dropped python 2 support on the master branch. This breaks our py27 unit test. Use a python version-specific dependency on ironic_inspector in test-requirements.txt. --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index f7e5496..5153311 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,5 +9,5 @@ fixtures>=3.0.0 # Apache-2.0/BSD testresources>=0.2.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 --e git+https://opendev.org/openstack/ironic-inspector.git@master#egg=ironic_inspector # Apache-2.0 - +ironic_inspector<10.0.0;python_version<'3.0' # Apache-2.0 +ironic_inspector;python_version>='3.0' # Apache-2.0 From 68eb6a9f9f3e0350b7ea36b6b12ed619a311dcf4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 2 Jan 2020 10:11:16 +0000 Subject: [PATCH 2/2] Fix unit tests for python 3 Fixing this error: TypeError: 'dict_values' object does not support indexing --- .../tests/unit/test_plugins_base_physnet.py | 2 +- .../tests/unit/test_plugins_ib_physnet.py | 6 +++--- .../tests/unit/test_plugins_system_name_physnet.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stackhpc_inspector_plugins/tests/unit/test_plugins_base_physnet.py b/stackhpc_inspector_plugins/tests/unit/test_plugins_base_physnet.py index 0c04591..0c62989 100644 --- a/stackhpc_inspector_plugins/tests/unit/test_plugins_base_physnet.py +++ b/stackhpc_inspector_plugins/tests/unit/test_plugins_base_physnet.py @@ -66,7 +66,7 @@ def test_expected_data(self, mock_get, mock_patch, mock_client): ] mock_get.return_value = 'physnet2' self.hook.before_update(self.data, self.node_info) - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] mock_get.assert_called_once_with(port, 'em1', self.data) self.assertCalledWithPatch(patches, mock_patch) diff --git a/stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py b/stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py index d4a0582..00b4a76 100644 --- a/stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py +++ b/stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py @@ -54,7 +54,7 @@ def setUp(self): def test_expected_data_ib(self): cfg.CONF.set_override('ib_physnet', 'physnet1', group='port_physnet') - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertEqual(physnet, 'physnet1') @@ -62,7 +62,7 @@ def test_expected_data_client_id_is_none(self): cfg.CONF.set_override('ib_physnet', 'physnet1', group='port_physnet') self.data['all_interfaces']['em1']['client_id'] = None - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertIsNone(physnet) @@ -70,6 +70,6 @@ def test_expected_data_no_client_id(self): cfg.CONF.set_override('ib_physnet', 'physnet1', group='port_physnet') del self.data['all_interfaces']['em1']['client_id'] - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertIsNone(physnet) diff --git a/stackhpc_inspector_plugins/tests/unit/test_plugins_system_name_physnet.py b/stackhpc_inspector_plugins/tests/unit/test_plugins_system_name_physnet.py index 8358130..0461cfd 100644 --- a/stackhpc_inspector_plugins/tests/unit/test_plugins_system_name_physnet.py +++ b/stackhpc_inspector_plugins/tests/unit/test_plugins_system_name_physnet.py @@ -56,20 +56,20 @@ def test_expected_data(self): sys_name_mapping = 'switch-1:physnet1,switch-2:physnet2' cfg.CONF.set_override('switch_sys_name_mapping', sys_name_mapping, group='port_physnet') - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertEqual(physnet, 'physnet1') def test_no_lldp_processed(self): del self.data['all_interfaces']['em1']['lldp_processed'] - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertIsNone(physnet) def test_no_lldp_system_name(self): proc_data = self.data['all_interfaces']['em1'] del proc_data['lldp_processed']['switch_system_name'] - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertIsNone(physnet) @@ -77,7 +77,7 @@ def test_no_mapping(self): sys_name_mapping = 'switch-2:physnet2' cfg.CONF.set_override('switch_sys_name_mapping', sys_name_mapping, group='port_physnet') - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] physnet = self.hook.get_physnet(port, 'em1', self.data) self.assertIsNone(physnet) @@ -85,6 +85,6 @@ def test_invalid_mapping(self): sys_name_mapping = 'switch-2:physnet1,switch-2:physnet2' cfg.CONF.set_override('switch_sys_name_mapping', sys_name_mapping, group='port_physnet') - port = self.node_info.ports().values()[0] + port = list(self.node_info.ports().values())[0] self.assertRaises(ValueError, self.hook.get_physnet, port, 'em1', self.data)