openstack/python-openstackclient
Code Issues Proposed changes

Merge "Replace assertItemsEqual with assertCountEqual"

Browse Source
This commit is contained in:
Zuul 2022-09-30 12:01:19 +00:00 committed by Gerrit Code Review
commit 217654e16c
3 changed files with 15 additions and 15 deletions
openstackclient/tests/unit
compute/v2
test_server.py
network/v2
test_local_ip.pytest_subnet.py

12
openstackclient/tests/unit/compute/v2/test_server.py

@ -5101,8 +5101,8 @@ class TestServerListV273(_TestServerList):
self.search_opts['locked'] = True self.search_opts['locked'] = True
self.servers_mock.list.assert_called_with(**self.kwargs) self.servers_mock.list.assert_called_with(**self.kwargs)
self.assertItemsEqual(self.columns, columns) self.assertCountEqual(self.columns, columns)
self.assertItemsEqual(self.data, tuple(data)) self.assertCountEqual(self.data, tuple(data))
def test_server_list_with_unlocked_v273(self): def test_server_list_with_unlocked_v273(self):
@ -5121,8 +5121,8 @@ class TestServerListV273(_TestServerList):
self.search_opts['locked'] = False self.search_opts['locked'] = False
self.servers_mock.list.assert_called_with(**self.kwargs) self.servers_mock.list.assert_called_with(**self.kwargs)
self.assertItemsEqual(self.columns, columns) self.assertCountEqual(self.columns, columns)
self.assertItemsEqual(self.data, tuple(data)) self.assertCountEqual(self.data, tuple(data))
def test_server_list_with_locked_and_unlocked(self): def test_server_list_with_locked_and_unlocked(self):
@ -5162,8 +5162,8 @@ class TestServerListV273(_TestServerList):
self.servers_mock.list.assert_called_with(**self.kwargs) self.servers_mock.list.assert_called_with(**self.kwargs)
self.assertItemsEqual(self.columns, columns) self.assertCountEqual(self.columns, columns)
self.assertItemsEqual(self.data, tuple(data)) self.assertCountEqual(self.data, tuple(data))
@mock.patch.object(iso8601, 'parse_date', side_effect=iso8601.ParseError) @mock.patch.object(iso8601, 'parse_date', side_effect=iso8601.ParseError)
def test_server_list_with_invalid_changes_before( def test_server_list_with_invalid_changes_before(

14
openstackclient/tests/unit/network/v2/test_local_ip.py

@ -96,7 +96,7 @@ class TestCreateLocalIP(TestLocalIP):
self.network.create_local_ip.assert_called_once_with(**{}) self.network.create_local_ip.assert_called_once_with(**{})
self.assertEqual(set(self.columns), set(columns)) self.assertEqual(set(self.columns), set(columns))
self.assertItemsEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_all_options(self): def test_create_all_options(self):
arglist = [ arglist = [
@ -130,7 +130,7 @@ class TestCreateLocalIP(TestLocalIP):
'ip_mode': self.new_local_ip.ip_mode, 'ip_mode': self.new_local_ip.ip_mode,
}) })
self.assertEqual(set(self.columns), set(columns)) self.assertEqual(set(self.columns), set(columns))
self.assertItemsEqual(self.data, data) self.assertCountEqual(self.data, data)
class TestDeleteLocalIP(TestLocalIP): class TestDeleteLocalIP(TestLocalIP):
@ -263,7 +263,7 @@ class TestListLocalIP(TestLocalIP):
self.network.local_ips.assert_called_once_with(**{}) self.network.local_ips.assert_called_once_with(**{})
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_local_ip_list_name(self): def test_local_ip_list_name(self):
arglist = [ arglist = [
@ -278,7 +278,7 @@ class TestListLocalIP(TestLocalIP):
self.network.local_ips.assert_called_once_with( self.network.local_ips.assert_called_once_with(
**{'name': self.local_ips[0].name}) **{'name': self.local_ips[0].name})
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_local_ip_list_project(self): def test_local_ip_list_project(self):
project = identity_fakes_v3.FakeProject.create_one_project() project = identity_fakes_v3.FakeProject.create_one_project()
@ -295,7 +295,7 @@ class TestListLocalIP(TestLocalIP):
self.network.local_ips.assert_called_once_with( self.network.local_ips.assert_called_once_with(
**{'project_id': project.id}) **{'project_id': project.id})
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_local_ip_project_domain(self): def test_local_ip_project_domain(self):
project = identity_fakes_v3.FakeProject.create_one_project() project = identity_fakes_v3.FakeProject.create_one_project()
@ -314,7 +314,7 @@ class TestListLocalIP(TestLocalIP):
self.network.local_ips.assert_called_once_with(**filters) self.network.local_ips.assert_called_once_with(**filters)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_local_ip_list_network(self): def test_local_ip_list_network(self):
arglist = [ arglist = [
@ -477,4 +477,4 @@ class TestShowLocalIP(TestLocalIP):
self.network.find_local_ip.assert_called_once_with( self.network.find_local_ip.assert_called_once_with(
self._local_ip.name, ignore_missing=False) self._local_ip.name, ignore_missing=False)
self.assertEqual(set(self.columns), set(columns)) self.assertEqual(set(self.columns), set(columns))
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))

4
openstackclient/tests/unit/network/v2/test_subnet.py

@ -918,7 +918,7 @@ class TestListSubnet(TestSubnet):
self.network.subnets.assert_called_once_with(**filters) self.network.subnets.assert_called_once_with(**filters)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_subnet_list_subnetpool_by_id(self): def test_subnet_list_subnetpool_by_id(self):
subnet_pool = network_fakes.FakeSubnetPool.create_one_subnet_pool() subnet_pool = network_fakes.FakeSubnetPool.create_one_subnet_pool()
@ -939,7 +939,7 @@ class TestListSubnet(TestSubnet):
self.network.subnets.assert_called_once_with(**filters) self.network.subnets.assert_called_once_with(**filters)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertItemsEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_list_with_tag_options(self): def test_list_with_tag_options(self):
arglist = [ arglist = [