From b026a064b1f0a52d09a6b743823a5621ddeb2804 Mon Sep 17 00:00:00 2001

From: Alfredo Moralejo <amoralej@redhat.com>

Date: Mon, 1 Jun 2020 16:28:29 +0200

Subject: [PATCH] Replace assertItemsEqual with assertCountEqual

assertItemsEqual was removed from Python's unittest.TestCase in

Python 3.3 [1][2]. We have been able to use them since then, because

testtools required unittest2, which still included it. With testtools

removing Python 2.7 support [3][4], we will lose support for

assertItemsEqual, so we should switch to use assertCountEqual.

[1] - https://bugs.python.org/issue17866

[2] - https://hg.python.org/cpython/rev/d9921cb6e3cd

[3] - testing-cabal/testtools#286

[4] - testing-cabal/testtools#277

---

 .../tests/unit/compute/v2/test_aggregate.py   | 16 ++---

 .../tests/unit/compute/v2/test_flavor.py      | 14 ++--

 .../tests/unit/compute/v2/test_hypervisor.py  |  6 +-

 .../unit/compute/v2/test_server_backup.py     |  6 +-

 .../unit/compute/v2/test_server_image.py      |  6 +-

 .../tests/unit/identity/v2_0/test_catalog.py  |  6 +-

 .../tests/unit/identity/v2_0/test_project.py  |  2 +-

 .../tests/unit/identity/v2_0/test_user.py     |  8 +--

 .../tests/unit/identity/v3/test_catalog.py    |  4 +-

 .../identity/v3/test_identity_provider.py     | 24 +++----

 .../tests/unit/image/v1/test_image.py         | 10 +--

 .../tests/unit/image/v2/test_image.py         | 24 +++----

 .../unit/network/v2/test_address_group.py     | 14 ++--

 .../unit/network/v2/test_ip_availability.py   |  8 +--

 .../tests/unit/network/v2/test_network.py     | 46 ++++++-------

 .../unit/network/v2/test_network_agent.py     | 14 ++--

 .../tests/unit/network/v2/test_port.py        | 68 +++++++++----------

 .../tests/unit/network/v2/test_router.py      | 32 ++++-----

 .../network/v2/test_security_group_compute.py | 10 +--

 .../network/v2/test_security_group_network.py | 16 ++---

 .../tests/unit/network/v2/test_subnet.py      | 42 ++++++------

 .../tests/unit/network/v2/test_subnet_pool.py | 40 +++++------

 .../tests/unit/volume/v1/test_qos_specs.py    | 12 ++--

 .../tests/unit/volume/v1/test_type.py         | 14 ++--

 .../tests/unit/volume/v1/test_volume.py       | 36 +++++-----

 .../unit/volume/v1/test_volume_backup.py      | 10 +--

 .../unit/volume/v2/test_consistency_group.py  | 14 ++--

 .../tests/unit/volume/v2/test_qos_specs.py    | 12 ++--

 .../tests/unit/volume/v2/test_type.py         | 24 +++----

 .../tests/unit/volume/v2/test_volume.py       | 40 +++++------

 .../unit/volume/v2/test_volume_backup.py      |  4 +-

 31 files changed, 291 insertions(+), 291 deletions(-)

diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py

index 8563f988..7c4fe5cb 100644

--- a/openstackclient/tests/unit/compute/v2/test_aggregate.py

+++ b/openstackclient/tests/unit/compute/v2/test_aggregate.py

@@ -88,7 +88,7 @@ class TestAggregateAddHost(TestAggregate):

         self.sdk_client.add_host_to_aggregate.assert_called_once_with(

             self.fake_ag.id, parsed_args.host)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

 class TestAggregateCreate(TestAggregate):

@@ -112,7 +112,7 @@ class TestAggregateCreate(TestAggregate):

         self.sdk_client.create_aggregate.assert_called_once_with(

             name=parsed_args.name)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_aggregate_create_with_zone(self):

         arglist = [

@@ -129,7 +129,7 @@ class TestAggregateCreate(TestAggregate):

         self.sdk_client.create_aggregate.assert_called_once_with(

             name=parsed_args.name, availability_zone=parsed_args.zone)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_aggregate_create_with_property(self):

         arglist = [

@@ -148,7 +148,7 @@ class TestAggregateCreate(TestAggregate):

         self.sdk_client.set_aggregate_metadata.assert_called_once_with(

             self.fake_ag.id, parsed_args.properties)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

 class TestAggregateDelete(TestAggregate):

@@ -265,7 +265,7 @@ class TestAggregateList(TestAggregate):

         columns, data = self.cmd.take_action(parsed_args)

         self.assertEqual(self.list_columns, columns)

-        self.assertItemsEqual(self.list_data, tuple(data))

+        self.assertCountEqual(self.list_data, tuple(data))

     def test_aggregate_list_with_long(self):

         arglist = [

@@ -278,7 +278,7 @@ class TestAggregateList(TestAggregate):

         columns, data = self.cmd.take_action(parsed_args)

         self.assertEqual(self.list_columns_long, columns)

-        self.assertItemsEqual(self.list_data_long, tuple(data))

+        self.assertCountEqual(self.list_data_long, tuple(data))

 class TestAggregateRemoveHost(TestAggregate):

@@ -306,7 +306,7 @@ class TestAggregateRemoveHost(TestAggregate):

         self.sdk_client.remove_host_from_aggregate.assert_called_once_with(

             self.fake_ag.id, parsed_args.host)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

 class TestAggregateSet(TestAggregate):

@@ -492,7 +492,7 @@ class TestAggregateShow(TestAggregate):

             parsed_args.aggregate, ignore_missing=False)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, tuple(data))

+        self.assertCountEqual(self.data, tuple(data))

 class TestAggregateUnset(TestAggregate):

diff --git a/openstackclient/tests/unit/compute/v2/test_flavor.py b/openstackclient/tests/unit/compute/v2/test_flavor.py

index ee4479b0..14dd3df2 100644

--- a/openstackclient/tests/unit/compute/v2/test_flavor.py

+++ b/openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -133,7 +133,7 @@ class TestFlavorCreate(TestFlavor):

         self.sdk_client.create_flavor.assert_called_once_with(**default_args)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_flavor_create_all_options(self):

@@ -202,7 +202,7 @@ class TestFlavorCreate(TestFlavor):

             self.sdk_client.get_flavor_access.assert_not_called()

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(tuple(cmp_data), data)

+        self.assertCountEqual(tuple(cmp_data), data)

     def test_flavor_create_other_options(self):

@@ -277,7 +277,7 @@ class TestFlavorCreate(TestFlavor):

         self.sdk_client.create_flavor_extra_specs.assert_called_with(

             create_flavor, props)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(cmp_data, data)

+        self.assertCountEqual(cmp_data, data)

     def test_public_flavor_create_with_project(self):

         arglist = [

@@ -350,7 +350,7 @@ class TestFlavorCreate(TestFlavor):

         self.sdk_client.create_flavor.assert_called_once_with(**args)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data_private, data)

+        self.assertCountEqual(self.data_private, data)

     def test_flavor_create_with_description_api_older(self):

         arglist = [

@@ -633,7 +633,7 @@ class TestFlavorList(TestFlavor):

         )

         self.assertEqual(self.columns_long, columns)

-        self.assertItemsEqual(self.data_long, tuple(data))

+        self.assertCountEqual(self.data_long, tuple(data))

     def test_flavor_list_min_disk_min_ram(self):

         arglist = [

@@ -951,7 +951,7 @@ class TestFlavorShow(TestFlavor):

         columns, data = self.cmd.take_action(parsed_args)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_private_flavor_show(self):

         private_flavor = compute_fakes.FakeFlavor.create_one_flavor(

@@ -991,7 +991,7 @@ class TestFlavorShow(TestFlavor):

         self.sdk_client.get_flavor_access.assert_called_with(

             flavor=private_flavor.id)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(data_with_project, data)

+        self.assertCountEqual(data_with_project, data)

 class TestFlavorUnset(TestFlavor):

diff --git a/openstackclient/tests/unit/compute/v2/test_hypervisor.py b/openstackclient/tests/unit/compute/v2/test_hypervisor.py

index 3220a764..7dbd6e19 100644

--- a/openstackclient/tests/unit/compute/v2/test_hypervisor.py

+++ b/openstackclient/tests/unit/compute/v2/test_hypervisor.py

@@ -394,7 +394,7 @@ class TestHypervisorShow(TestHypervisor):

         columns, data = self.cmd.take_action(parsed_args)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_hypervisor_show_pre_v228(self):

         self.app.client_manager.compute.api_version = \

@@ -420,7 +420,7 @@ class TestHypervisorShow(TestHypervisor):

         columns, data = self.cmd.take_action(parsed_args)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_hypervisor_show_uptime_not_implemented(self):

         self.app.client_manager.compute.api_version = \

@@ -492,4 +492,4 @@ class TestHypervisorShow(TestHypervisor):

         )

         self.assertEqual(expected_columns, columns)

-        self.assertItemsEqual(expected_data, data)

+        self.assertCountEqual(expected_data, data)

diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py

index 753db9cd..0012d700 100644

--- a/openstackclient/tests/unit/compute/v2/test_server_backup.py

+++ b/openstackclient/tests/unit/compute/v2/test_server_backup.py

@@ -139,7 +139,7 @@ class TestServerBackupCreate(TestServerBackup):

         )

         self.assertEqual(self.image_columns(images[0]), columns)

-        self.assertItemsEqual(self.image_data(images[0]), data)

+        self.assertCountEqual(self.image_data(images[0]), data)

     def test_server_backup_create_options(self):

         servers = self.setup_servers_mock(count=1)

@@ -173,7 +173,7 @@ class TestServerBackupCreate(TestServerBackup):

         )

         self.assertEqual(self.image_columns(images[0]), columns)

-        self.assertItemsEqual(self.image_data(images[0]), data)

+        self.assertCountEqual(self.image_data(images[0]), data)

     @mock.patch.object(common_utils, 'wait_for_status', return_value=False)

     def test_server_backup_wait_fail(self, mock_wait_for_status):

@@ -269,4 +269,4 @@ class TestServerBackupCreate(TestServerBackup):

         )

         self.assertEqual(self.image_columns(images[0]), columns)

-        self.assertItemsEqual(self.image_data(images[0]), data)

+        self.assertCountEqual(self.image_data(images[0]), data)

diff --git a/openstackclient/tests/unit/compute/v2/test_server_image.py b/openstackclient/tests/unit/compute/v2/test_server_image.py

index 66452a8b..9b14428a 100644

--- a/openstackclient/tests/unit/compute/v2/test_server_image.py

+++ b/openstackclient/tests/unit/compute/v2/test_server_image.py

@@ -134,7 +134,7 @@ class TestServerImageCreate(TestServerImage):

         )

         self.assertEqual(self.image_columns(images[0]), columns)

-        self.assertItemsEqual(self.image_data(images[0]), data)

+        self.assertCountEqual(self.image_data(images[0]), data)

     def test_server_image_create_options(self):

         servers = self.setup_servers_mock(count=1)

@@ -165,7 +165,7 @@ class TestServerImageCreate(TestServerImage):

         )

         self.assertEqual(self.image_columns(images[0]), columns)

-        self.assertItemsEqual(self.image_data(images[0]), data)

+        self.assertCountEqual(self.image_data(images[0]), data)

     @mock.patch.object(common_utils, 'wait_for_status', return_value=False)

     def test_server_create_image_wait_fail(self, mock_wait_for_status):

@@ -235,4 +235,4 @@ class TestServerImageCreate(TestServerImage):

         )

         self.assertEqual(self.image_columns(images[0]), columns)

-        self.assertItemsEqual(self.image_data(images[0]), data)

+        self.assertCountEqual(self.image_data(images[0]), data)

diff --git a/openstackclient/tests/unit/identity/v2_0/test_catalog.py b/openstackclient/tests/unit/identity/v2_0/test_catalog.py

index e2c56ba1..bfb28f69 100644

--- a/openstackclient/tests/unit/identity/v2_0/test_catalog.py

+++ b/openstackclient/tests/unit/identity/v2_0/test_catalog.py

@@ -74,7 +74,7 @@ class TestCatalogList(TestCatalog):

             catalog.EndpointsColumn(

                 auth_ref.service_catalog.catalog[0]['endpoints']),

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

     def test_catalog_list_with_endpoint_url(self):

         attr = {

@@ -117,7 +117,7 @@ class TestCatalogList(TestCatalog):

             catalog.EndpointsColumn(

                 auth_ref.service_catalog.catalog[0]['endpoints']),

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

 class TestCatalogShow(TestCatalog):

@@ -158,7 +158,7 @@ class TestCatalogShow(TestCatalog):

             'supernova',

             'compute',

         )

-        self.assertItemsEqual(datalist, data)

+        self.assertCountEqual(datalist, data)

 class TestFormatColumns(TestCatalog):

diff --git a/openstackclient/tests/unit/identity/v2_0/test_project.py b/openstackclient/tests/unit/identity/v2_0/test_project.py

index 766d5dab..496214aa 100644

--- a/openstackclient/tests/unit/identity/v2_0/test_project.py

+++ b/openstackclient/tests/unit/identity/v2_0/test_project.py

@@ -643,7 +643,7 @@ class TestProjectShow(TestProject):

             self.fake_proj_show.name,

             format_columns.DictColumn({}),

         )

-        self.assertItemsEqual(datalist, data)

+        self.assertCountEqual(datalist, data)

 class TestProjectUnset(TestProject):

diff --git a/openstackclient/tests/unit/identity/v2_0/test_user.py b/openstackclient/tests/unit/identity/v2_0/test_user.py

index dd300478..c3f5f1d7 100644

--- a/openstackclient/tests/unit/identity/v2_0/test_user.py

+++ b/openstackclient/tests/unit/identity/v2_0/test_user.py

@@ -482,7 +482,7 @@ class TestUserList(TestUser):

         self.users_mock.list.assert_called_with(tenant_id=None)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_user_list_project(self):

         arglist = [

@@ -502,7 +502,7 @@ class TestUserList(TestUser):

         self.users_mock.list.assert_called_with(tenant_id=project_id)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_user_list_long(self):

         arglist = [

@@ -531,7 +531,7 @@ class TestUserList(TestUser):

             self.fake_user_l.email,

             True,

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

 class TestUserSet(TestUser):

@@ -819,4 +819,4 @@ class TestUserShow(TestUser):

             self.fake_user.name,

             self.fake_project.id,

         )

-        self.assertItemsEqual(datalist, data)

+        self.assertCountEqual(datalist, data)

diff --git a/openstackclient/tests/unit/identity/v3/test_catalog.py b/openstackclient/tests/unit/identity/v3/test_catalog.py

index 97ce48f6..802a9017 100644

--- a/openstackclient/tests/unit/identity/v3/test_catalog.py

+++ b/openstackclient/tests/unit/identity/v3/test_catalog.py

@@ -94,7 +94,7 @@ class TestCatalogList(TestCatalog):

             catalog.EndpointsColumn(

                 auth_ref.service_catalog.catalog[0]['endpoints']),

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

 class TestCatalogShow(TestCatalog):

@@ -135,7 +135,7 @@ class TestCatalogShow(TestCatalog):

             'supernova',

             'compute',

         )

-        self.assertItemsEqual(datalist, data)

+        self.assertCountEqual(datalist, data)

 class TestFormatColumns(TestCatalog):

diff --git a/openstackclient/tests/unit/identity/v3/test_identity_provider.py b/openstackclient/tests/unit/identity/v3/test_identity_provider.py

index 5aff2b1b..1a9a7991 100644

--- a/openstackclient/tests/unit/identity/v3/test_identity_provider.py

+++ b/openstackclient/tests/unit/identity/v3/test_identity_provider.py

@@ -89,7 +89,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

     def test_create_identity_provider_description(self):

         arglist = [

@@ -117,7 +117,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

     def test_create_identity_provider_remote_id(self):

         arglist = [

@@ -145,7 +145,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

     def test_create_identity_provider_remote_ids_multiple(self):

         arglist = [

@@ -174,7 +174,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

     def test_create_identity_provider_remote_ids_file(self):

         arglist = [

@@ -207,7 +207,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

     def test_create_identity_provider_disabled(self):

@@ -250,7 +250,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

             identity_fakes.idp_id,

             identity_fakes.formatted_idp_remote_ids

         )

-        self.assertItemsEqual(datalist, data)

+        self.assertCountEqual(datalist, data)

     def test_create_identity_provider_domain_name(self):

         arglist = [

@@ -278,7 +278,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

     def test_create_identity_provider_domain_id(self):

         arglist = [

@@ -306,7 +306,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, data)

+        self.assertCountEqual(self.datalist, data)

 class TestIdentityProviderDelete(TestIdentityProvider):

@@ -382,7 +382,7 @@ class TestIdentityProviderList(TestIdentityProvider):

             identity_fakes.domain_id,

             identity_fakes.idp_description,

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

     def test_identity_provider_list_ID_option(self):

         arglist = ['--id',

@@ -410,7 +410,7 @@ class TestIdentityProviderList(TestIdentityProvider):

             identity_fakes.domain_id,

             identity_fakes.idp_description,

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

     def test_identity_provider_list_enabled_option(self):

         arglist = ['--enabled']

@@ -437,7 +437,7 @@ class TestIdentityProviderList(TestIdentityProvider):

             identity_fakes.domain_id,

             identity_fakes.idp_description,

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

 class TestIdentityProviderSet(TestIdentityProvider):

@@ -722,4 +722,4 @@ class TestIdentityProviderShow(TestIdentityProvider):

             identity_fakes.idp_id,

             identity_fakes.formatted_idp_remote_ids

         )

-        self.assertItemsEqual(datalist, data)

+        self.assertCountEqual(datalist, data)

diff --git a/openstackclient/tests/unit/image/v1/test_image.py b/openstackclient/tests/unit/image/v1/test_image.py

index db64983c..5c69bf0f 100644

--- a/openstackclient/tests/unit/image/v1/test_image.py

+++ b/openstackclient/tests/unit/image/v1/test_image.py

@@ -100,7 +100,7 @@ class TestImageCreate(TestImage):

         self.assertEqual(self.client.update_image.call_args_list, [])

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     @mock.patch('sys.stdin', side_effect=[None])

     def test_image_reserve_options(self, raw_input):

@@ -149,7 +149,7 @@ class TestImageCreate(TestImage):

         self.assertEqual(self.client.update_image.call_args_list, [])

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     @mock.patch('openstackclient.image.v1.image.io.open', name='Open')

     def test_image_create_file(self, mock_open):

@@ -205,7 +205,7 @@ class TestImageCreate(TestImage):

         self.assertEqual(self.client.update_image.call_args_list, [])

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

 class TestImageDelete(TestImage):

@@ -386,7 +386,7 @@ class TestImageList(TestImage):

             format_columns.DictColumn(

                 {'Alpha': 'a', 'Beta': 'b', 'Gamma': 'g'}),

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

     @mock.patch('osc_lib.api.utils.simple_filter')

     def test_image_list_property_option(self, sf_mock):

@@ -737,7 +737,7 @@ class TestImageShow(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_image_show_human_readable(self):

         arglist = [

diff --git a/openstackclient/tests/unit/image/v2/test_image.py b/openstackclient/tests/unit/image/v2/test_image.py

index 87dfdbea..b51a15e3 100644

--- a/openstackclient/tests/unit/image/v2/test_image.py

+++ b/openstackclient/tests/unit/image/v2/test_image.py

@@ -111,7 +111,7 @@ class TestImageCreate(TestImage):

         self.assertEqual(

             self.expected_columns,

             columns)

-        self.assertItemsEqual(

+        self.assertCountEqual(

             self.expected_data,

             data)

@@ -166,7 +166,7 @@ class TestImageCreate(TestImage):

         self.assertEqual(

             self.expected_columns,

             columns)

-        self.assertItemsEqual(

+        self.assertCountEqual(

             self.expected_data,

             data)

@@ -255,7 +255,7 @@ class TestImageCreate(TestImage):

         self.assertEqual(

             self.expected_columns,

             columns)

-        self.assertItemsEqual(

+        self.assertCountEqual(

             self.expected_data,

             data)

@@ -513,7 +513,7 @@ class TestImageList(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_image_list_public_option(self):

         arglist = [

@@ -537,7 +537,7 @@ class TestImageList(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_image_list_private_option(self):

         arglist = [

@@ -561,7 +561,7 @@ class TestImageList(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_image_list_community_option(self):

         arglist = [

@@ -609,7 +609,7 @@ class TestImageList(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_image_list_shared_member_status_option(self):

         arglist = [

@@ -697,7 +697,7 @@ class TestImageList(TestImage):

             self._image.owner_id,

             format_columns.ListColumn(self._image.tags),

         ), )

-        self.assertItemsEqual(datalist, tuple(data))

+        self.assertCountEqual(datalist, tuple(data))

     @mock.patch('osc_lib.api.utils.simple_filter')

     def test_image_list_property_option(self, sf_mock):

@@ -725,7 +725,7 @@ class TestImageList(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     @mock.patch('osc_lib.utils.sort_items')

     def test_image_list_sort_option(self, si_mock):

@@ -747,7 +747,7 @@ class TestImageList(TestImage):

             str,

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     def test_image_list_limit_option(self):

         ret_limit = 1

@@ -782,7 +782,7 @@ class TestImageList(TestImage):

         columns, data = self.cmd.take_action(parsed_args)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.datalist, tuple(data))

+        self.assertCountEqual(self.datalist, tuple(data))

     @mock.patch('osc_lib.utils.find_resource')

     def test_image_list_marker_option(self, fr_mock):

@@ -1487,7 +1487,7 @@ class TestImageShow(TestImage):

         )

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_image_show_human_readable(self):

         self.client.find_image.return_value = self.new_image

diff --git a/openstackclient/tests/unit/network/v2/test_address_group.py b/openstackclient/tests/unit/network/v2/test_address_group.py

index e4fa8ab3..a5ee83cb 100644

--- a/openstackclient/tests/unit/network/v2/test_address_group.py

+++ b/openstackclient/tests/unit/network/v2/test_address_group.py

@@ -99,7 +99,7 @@ class TestCreateAddressGroup(TestAddressGroup):

             'addresses': [],

         })

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

     def test_create_all_options(self):

         arglist = [

@@ -127,7 +127,7 @@ class TestCreateAddressGroup(TestAddressGroup):

             'description': self.new_address_group.description,

         })

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, data)

+        self.assertCountEqual(self.data, data)

 class TestDeleteAddressGroup(TestAddressGroup):

@@ -252,7 +252,7 @@ class TestListAddressGroup(TestAddressGroup):

         self.network.address_groups.assert_called_once_with(**{})

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, list(data))

+        self.assertCountEqual(self.data, list(data))

     def test_address_group_list_name(self):

         arglist = [

@@ -267,7 +267,7 @@ class TestListAddressGroup(TestAddressGroup):

         self.network.address_groups.assert_called_once_with(

             **{'name': self.address_groups[0].name})

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, list(data))

+        self.assertCountEqual(self.data, list(data))

     def test_address_group_list_project(self):

         project = identity_fakes_v3.FakeProject.create_one_project()

@@ -284,7 +284,7 @@ class TestListAddressGroup(TestAddressGroup):

         self.network.address_groups.assert_called_once_with(

             project_id=project.id)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, list(data))

+        self.assertCountEqual(self.data, list(data))

     def test_address_group_project_domain(self):

         project = identity_fakes_v3.FakeProject.create_one_project()

@@ -302,7 +302,7 @@ class TestListAddressGroup(TestAddressGroup):

         self.network.address_groups.assert_called_once_with(

             project_id=project.id)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, list(data))

+        self.assertCountEqual(self.data, list(data))

 class TestSetAddressGroup(TestAddressGroup):

@@ -438,7 +438,7 @@ class TestShowAddressGroup(TestAddressGroup):

         self.network.find_address_group.assert_called_once_with(

             self._address_group.name, ignore_missing=False)

         self.assertEqual(self.columns, columns)

-        self.assertItemsEqual(self.data, list(data))

+        self.assertCountEqual(self.data, list(data))

 class TestUnsetAddressGroup(TestAddressGroup):

diff --git a/openstackclient/tests/unit/network/v2/test_ip_availability.py b/openstackclient/tests/unit/network/v2/test_ip_availability.py