Make use of comparable 'FormattableColumn' subclasses

This requires fixes found in cliff 3.5.0 [1] and osc-lib 2.3.0 [2]. With
these fixes in place, we can remove the icky, still broken
'assertItemEqual' and 'assertListItemEqual' helpers.

[1] https://review.opendev.org/761421
[2] https://review.opendev.org/761394

Change-Id: Id6c26b37c3c7d5ec6761361abca57f9219b76838
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

4 files changed, 22 insertions, 22 deletions

diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py
index e4c13ea5..e12edd0f 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.assertItemEqual(self.data, data)
+        self.assertItemsEqual(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.assertItemEqual(self.data, data)
+        self.assertItemsEqual(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.assertItemEqual(self.data, data)
+        self.assertItemsEqual(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.property)
         self.assertEqual(self.columns, columns)
-        self.assertItemEqual(self.data, data)
+        self.assertItemsEqual(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.assertItemEqual(self.list_data, tuple(data))
+        self.assertItemsEqual(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.assertListItemEqual(self.list_data_long, tuple(data))
+        self.assertItemsEqual(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.assertItemEqual(self.data, data)
+        self.assertItemsEqual(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.assertItemEqual(self.data, tuple(data))
+        self.assertItemsEqual(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 8625b712..4c4882ec 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.assertItemEqual(self.data, data)
+        self.assertItemsEqual(self.data, data)
 
     def test_flavor_create_all_options(self):
 
@@ -201,8 +201,8 @@ class TestFlavorCreate(TestFlavor):
                 create_flavor, props)
             self.sdk_client.get_flavor_access.assert_not_called()
 
-            self.assertEqual(self.columns, columns)
-            self.assertItemEqual(tuple(cmp_data), data)
+        self.assertEqual(self.columns, columns)
+        self.assertItemsEqual(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.assertItemEqual(cmp_data, data)
+        self.assertItemsEqual(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.assertItemEqual(self.data_private, data)
+        self.assertItemsEqual(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.assertListItemEqual(self.data_long, tuple(data))
+        self.assertItemsEqual(self.data_long, tuple(data))
 
 
 class TestFlavorSet(TestFlavor):
@@ -920,7 +920,7 @@ class TestFlavorShow(TestFlavor):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.assertEqual(self.columns, columns)
-        self.assertItemEqual(self.data, data)
+        self.assertItemsEqual(self.data, data)
 
     def test_private_flavor_show(self):
         private_flavor = compute_fakes.FakeFlavor.create_one_flavor(
@@ -960,7 +960,7 @@ class TestFlavorShow(TestFlavor):
         self.sdk_client.get_flavor_access.assert_called_with(
             flavor=private_flavor.id)
         self.assertEqual(self.columns, columns)
-        self.assertItemEqual(data_with_project, data)
+        self.assertItemsEqual(data_with_project, data)
 
 
 class TestFlavorUnset(TestFlavor):
diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py
index 5cdc2080..753db9cd 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.assertItemEqual(self.image_data(images[0]), data)
+        self.assertItemsEqual(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.assertItemEqual(self.image_data(images[0]), data)
+        self.assertItemsEqual(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.assertItemEqual(self.image_data(images[0]), data)
+        self.assertItemsEqual(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 1cec5b68..06f6017c 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_image.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_image.py
@@ -133,7 +133,7 @@ class TestServerImageCreate(TestServerImage):
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertItemEqual(self.image_data(images[0]), data)
+        self.assertItemsEqual(self.image_data(images[0]), data)
 
     def test_server_image_create_options(self):
         servers = self.setup_servers_mock(count=1)
@@ -161,7 +161,7 @@ class TestServerImageCreate(TestServerImage):
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertItemEqual(self.image_data(images[0]), data)
+        self.assertItemsEqual(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):
@@ -229,4 +229,4 @@ class TestServerImageCreate(TestServerImage):
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertItemEqual(self.image_data(images[0]), data)
+        self.assertItemsEqual(self.image_data(images[0]), data)