Merge "Replace assertItemsEqual with assertCountEqual"

Author: Zuul

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

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

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

@@ -96,7 +96,7 @@ def test_create_no_options(self):
 
         self.network.create_local_ip.assert_called_once_with(**{})
         self.assertEqual(set(self.columns), set(columns))
-        self.assertItemsEqual(self.data, data)
+        self.assertCountEqual(self.data, data)
 
     def test_create_all_options(self):
         arglist = [
@@ -130,7 +130,7 @@ def test_create_all_options(self):
             'ip_mode': self.new_local_ip.ip_mode,
         })
         self.assertEqual(set(self.columns), set(columns))
-        self.assertItemsEqual(self.data, data)
+        self.assertCountEqual(self.data, data)
 
 
 class TestDeleteLocalIP(TestLocalIP):
@@ -263,7 +263,7 @@ def test_local_ip_list(self):
 
         self.network.local_ips.assert_called_once_with(**{})
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))
 
     def test_local_ip_list_name(self):
         arglist = [
@@ -278,7 +278,7 @@ def test_local_ip_list_name(self):
         self.network.local_ips.assert_called_once_with(
             **{'name': self.local_ips[0].name})
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))
 
     def test_local_ip_list_project(self):
         project = identity_fakes_v3.FakeProject.create_one_project()
@@ -295,7 +295,7 @@ def test_local_ip_list_project(self):
         self.network.local_ips.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_local_ip_project_domain(self):
         project = identity_fakes_v3.FakeProject.create_one_project()
@@ -314,7 +314,7 @@ def test_local_ip_project_domain(self):
 
         self.network.local_ips.assert_called_once_with(**filters)
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))
 
     def test_local_ip_list_network(self):
         arglist = [
@@ -477,4 +477,4 @@ def test_show_all_options(self):
         self.network.find_local_ip.assert_called_once_with(
             self._local_ip.name, ignore_missing=False)
         self.assertEqual(set(self.columns), set(columns))
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))

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

@@ -918,7 +918,7 @@ def test_subnet_list_subnetpool_by_name(self):
 
         self.network.subnets.assert_called_once_with(**filters)
         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):
         subnet_pool = network_fakes.FakeSubnetPool.create_one_subnet_pool()
@@ -939,7 +939,7 @@ def test_subnet_list_subnetpool_by_id(self):
 
         self.network.subnets.assert_called_once_with(**filters)
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))
 
     def test_list_with_tag_options(self):
         arglist = [