Merge "Replace assertItemsEqual with assertCountEqual"

Author: Zuul

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

@@ -88,7 +88,7 @@ def test_aggregate_add_host(self):
         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 @@ def test_aggregate_create(self):
         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 @@ def test_aggregate_create_with_zone(self):
         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 @@ def test_aggregate_create_with_property(self):
         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 @@ def test_aggregate_list(self):
         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 @@ def test_aggregate_list_with_long(self):
         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 @@ def test_aggregate_remove_host(self):
         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 @@ def test_aggregate_show(self):
             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):

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

@@ -133,7 +133,7 @@ def test_flavor_create_default_options(self):
         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 @@ def test_flavor_create_all_options(self):
             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 @@ def test_flavor_create_other_options(self):
         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 @@ def test_flavor_create_with_description_api_newer(self):
         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 @@ def test_flavor_list_long(self):
         )
 
         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 @@ def test_public_flavor_show(self):
         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 @@ def test_private_flavor_show(self):
         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):

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

@@ -394,7 +394,7 @@ def test_hypervisor_show(self):
         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 @@ def test_hypervisor_show_pre_v228(self):
         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 @@ def test_hypervisor_show_uptime_not_implemented(self):
         )
 
         self.assertEqual(expected_columns, columns)
-        self.assertItemsEqual(expected_data, data)
+        self.assertCountEqual(expected_data, data)

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

@@ -139,7 +139,7 @@ def test_server_backup_defaults(self):
         )
 
         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 @@ def test_server_backup_create_options(self):
         )
 
         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 @@ def test_server_backup_wait_ok(self, mock_wait_for_status):
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertItemsEqual(self.image_data(images[0]), data)
+        self.assertCountEqual(self.image_data(images[0]), data)

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

@@ -134,7 +134,7 @@ def test_server_image_create_defaults(self):
         )
 
         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 @@ def test_server_image_create_options(self):
         )
 
         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 @@ def test_server_create_image_wait_ok(self, mock_wait_for_status):
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertItemsEqual(self.image_data(images[0]), data)
+        self.assertCountEqual(self.image_data(images[0]), data)

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

@@ -74,7 +74,7 @@ def test_catalog_list(self):
             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 @@ def test_catalog_list_with_endpoint_url(self):
             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 @@ def test_catalog_show(self):
             'supernova',
             'compute',
         )
-        self.assertItemsEqual(datalist, data)
+        self.assertCountEqual(datalist, data)
 
 
 class TestFormatColumns(TestCatalog):

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

@@ -643,7 +643,7 @@ def test_project_show(self):
             self.fake_proj_show.name,
             format_columns.DictColumn({}),
         )
-        self.assertItemsEqual(datalist, data)
+        self.assertCountEqual(datalist, data)
 
 
 class TestProjectUnset(TestProject):

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

@@ -482,7 +482,7 @@ def test_user_list_no_options(self):
         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 @@ def test_user_list_project(self):
         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 @@ def test_user_list_long(self):
             self.fake_user_l.email,
             True,
         ), )
-        self.assertItemsEqual(datalist, tuple(data))
+        self.assertCountEqual(datalist, tuple(data))
 
 
 class TestUserSet(TestUser):
@@ -819,4 +819,4 @@ def test_user_show(self):
             self.fake_user.name,
             self.fake_project.id,
         )
-        self.assertItemsEqual(datalist, data)
+        self.assertCountEqual(datalist, data)

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

@@ -94,7 +94,7 @@ def test_catalog_list(self):
             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 @@ def test_catalog_show(self):
             'supernova',
             'compute',
         )
-        self.assertItemsEqual(datalist, data)
+        self.assertCountEqual(datalist, data)
 
 
 class TestFormatColumns(TestCatalog):

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

@@ -89,7 +89,7 @@ def test_create_identity_provider_no_options(self):
         )
 
         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 @@ def test_create_identity_provider_description(self):
         )
 
         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 @@ def test_create_identity_provider_remote_id(self):
         )
 
         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 @@ def test_create_identity_provider_remote_ids_multiple(self):
         )
 
         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 @@ def test_create_identity_provider_remote_ids_file(self):
         )
 
         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 @@ def test_create_identity_provider_disabled(self):
             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 @@ def test_create_identity_provider_domain_name(self):
         )
 
         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 @@ def test_create_identity_provider_domain_id(self):
         )
 
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.datalist, data)
+        self.assertCountEqual(self.datalist, data)
 
 
 class TestIdentityProviderDelete(TestIdentityProvider):
@@ -382,7 +382,7 @@ def test_identity_provider_list_no_options(self):
             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 @@ def test_identity_provider_list_ID_option(self):
             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 @@ def test_identity_provider_list_enabled_option(self):
             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 @@ def test_identity_provider_show(self):
             identity_fakes.idp_id,
             identity_fakes.formatted_idp_remote_ids
         )
-        self.assertItemsEqual(datalist, data)
+        self.assertCountEqual(datalist, data)