Merge ~adam-collard/maas:no-assertItemsEqual-rpc into maas:master

[Adam Collard]

Unmerged commits

2f6b099... by Adam Collard on 2021-09-14

[rpc] Replace defunct assertItemsEqual

ae84549... by Adam Collard on 2021-09-14

Remove defunct assertItemsEqual in favour of bare assert ==

7c88e26... by Adam Collard on 2021-09-10

Drop unittest2, remove wrappers

diff --git a/src/maasserver/clusterrpc/tests/test_boot_images.py b/src/maasserver/clusterrpc/tests/test_boot_images.py
index d511c1e..43b5f18 100644
--- a/src/maasserver/clusterrpc/tests/test_boot_images.py
+++ b/src/maasserver/clusterrpc/tests/test_boot_images.py
@@ -175,7 +175,7 @@ class TestGetBootImagesTxn(MAASTransactionServerTestCase):
         for param in params:
             make_image_dir(param, self.tftp_root)
             test_tftppath.make_osystem(self, param["osystem"], purposes)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 make_image(param, purpose)
                 for param in params
@@ -213,7 +213,7 @@ class TestGetAvailableBootImages(MAASTransactionServerTestCase):
         for param in params:
             make_image_dir(param, self.tftp_root)
             test_tftppath.make_osystem(self, param["osystem"], purposes)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 make_image(param, purpose)
                 for param in params
@@ -243,7 +243,7 @@ class TestGetAvailableBootImages(MAASTransactionServerTestCase):
                 callRemote.return_value = succeed({"images": available_images})
 
         expected_images = images if self.all else available_images
-        self.assertItemsEqual(expected_images, self.get())
+        self.assertCountEqual(expected_images, self.get())
 
     def test_ignores_failures_when_talking_to_clusters(self):
         factory.make_RackController()
@@ -263,7 +263,7 @@ class TestGetAvailableBootImages(MAASTransactionServerTestCase):
                 # All clients but the first raise an exception.
                 callRemote.side_effect = ZeroDivisionError()
 
-        self.assertItemsEqual(images, self.get())
+        self.assertCountEqual(images, self.get())
 
     def test_returns_empty_list_when_all_clusters_fail(self):
         factory.make_RackController()
@@ -276,7 +276,7 @@ class TestGetAvailableBootImages(MAASTransactionServerTestCase):
             callRemote = self.patch(client._conn, "callRemote")
             callRemote.side_effect = ZeroDivisionError()
 
-        self.assertItemsEqual([], self.get())
+        self.assertEqual([], self.get())
 
 
 class TestGetBootImagesFor(MAASTransactionServerTestCase):
@@ -304,7 +304,7 @@ class TestGetBootImagesFor(MAASTransactionServerTestCase):
         params = self.make_boot_images()
         param = params.pop()
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             self.make_rpc_boot_images(param),
             get_boot_images_for(
                 rack,
@@ -339,7 +339,7 @@ class TestGetBootImagesFor(MAASTransactionServerTestCase):
         resource.save()
 
         subarch = subarches.pop()
-        self.assertItemsEqual(
+        self.assertCountEqual(
             self.make_rpc_boot_images(param),
             get_boot_images_for(
                 rack,
diff --git a/src/maasserver/clusterrpc/tests/test_osystems.py b/src/maasserver/clusterrpc/tests/test_osystems.py
index a369cc4..1fa0748 100644
--- a/src/maasserver/clusterrpc/tests/test_osystems.py
+++ b/src/maasserver/clusterrpc/tests/test_osystems.py
@@ -89,8 +89,8 @@ class TestGenAllKnownOperatingSystems(MAASServerTestCase):
             callRemote = self.patch(client._conn, "callRemote")
             callRemote.return_value = succeed(example)
 
-        self.assertItemsEqual(
-            example["osystems"], gen_all_known_operating_systems()
+        self.assertEqual(
+            example["osystems"], list(gen_all_known_operating_systems())
         )
 
     def test_ignores_failures_when_talking_to_clusters(self):
@@ -114,8 +114,9 @@ class TestGenAllKnownOperatingSystems(MAASServerTestCase):
         # The only OS information to get through is that from the first. The
         # failures arising from communicating with the other clusters have all
         # been suppressed.
-        self.assertItemsEqual(
-            [{"name": clients[0].ident}], gen_all_known_operating_systems()
+        self.assertEqual(
+            [{"name": clients[0].ident}],
+            list(gen_all_known_operating_systems()),
         )
 
     def test_fixes_custom_osystem_release_titles(self):
@@ -145,9 +146,9 @@ class TestGenAllKnownOperatingSystems(MAASServerTestCase):
         releases_with_titles = [
             {"name": release, "title": release.upper()} for release in releases
         ]
-        self.assertItemsEqual(
+        self.assertEqual(
             [{"name": "custom", "releases": releases_with_titles}],
-            gen_all_known_operating_systems(),
+            list(gen_all_known_operating_systems()),
         )
 
 
diff --git a/src/maasserver/clusterrpc/tests/test_power.py b/src/maasserver/clusterrpc/tests/test_power.py
index 5df7ef5..9aef476 100644
--- a/src/maasserver/clusterrpc/tests/test_power.py
+++ b/src/maasserver/clusterrpc/tests/test_power.py
@@ -227,8 +227,8 @@ class TestPowerQueryAll(MAASTransactionServerTestCase):
         )
 
         self.assertEqual(pick_best_power_state(power_states), power_state)
-        self.assertItemsEqual(successful_rack_ids, success_racks)
-        self.assertItemsEqual(error_rack_ids + failed_rack_ids, failed_racks)
+        self.assertCountEqual(successful_rack_ids, success_racks)
+        self.assertCountEqual(error_rack_ids + failed_rack_ids, failed_racks)
 
     @wait_for_reactor
     @inlineCallbacks
@@ -250,8 +250,8 @@ class TestPowerQueryAll(MAASTransactionServerTestCase):
         )
 
         self.assertEqual(POWER_STATE.UNKNOWN, power_state)
-        self.assertItemsEqual([], success_racks)
-        self.assertItemsEqual([rack_id], failed_racks)
+        self.assertEqual(set(), success_racks)
+        self.assertEqual({rack_id}, failed_racks)
 
 
 class TestSetBootOrder(MAASTransactionServerTestCase):
diff --git a/src/maasserver/clusterrpc/tests/test_utils.py b/src/maasserver/clusterrpc/tests/test_utils.py
index 2e82e6d..5ca6bca 100644
--- a/src/maasserver/clusterrpc/tests/test_utils.py
+++ b/src/maasserver/clusterrpc/tests/test_utils.py
@@ -51,8 +51,8 @@ class TestCallClusters(MAASServerTestCase):
         # call_clusters returns with nothing because we patched out
         # asynchronous.gather, but we're interested in the side-effect:
         # getClientFor has been called for the accepted nodegroup.
-        self.assertItemsEqual([], utils.call_clusters(sentinel.command))
-        self.assertThat(getClientFor, MockCalledOnceWith(rack.system_id))
+        self.assertEqual([], list(utils.call_clusters(sentinel.command)))
+        getClientFor.assert_called_once_with(rack.system_id)
 
     def test_with_successful_callbacks(self):
         rack = factory.make_RackController()
@@ -207,10 +207,10 @@ class TestCallRacksSynchronously(MAASServerTestCase):
         # call_clusters returns with nothing because we patched out
         # asynchronous.gather, but we're interested in the side-effect:
         # getClientFor has been called for the accepted nodegroup.
-        self.assertItemsEqual(
-            [], call_racks_synchronously(sentinel.command).results
+        self.assertEqual(
+            [], list(call_racks_synchronously(sentinel.command).results)
         )
-        self.assertThat(getClientFor, MockCalledOnceWith(rack.system_id))
+        getClientFor.assert_called_once_with(rack.system_id)
 
 
 class TestGetErrorMessageForException(MAASServerTestCase):
diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 712128f..12f14b4 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -151,7 +151,7 @@ def merge_kparams_with_extra(kparams, extra_kernel_opts):
     This section will merge the kparams with the extra opts. Our goal is to
     start with what is in kparams and then look to extra_opts for anything
     to add to or override settings in kparams. Anything in extra_opts, which
-    can be set through tabs, takes precedence so we use that to start with.
+    can be set through tags, takes precedence so we use that to start with.
     """
     final_params = ""
     if extra_kernel_opts is not None and extra_kernel_opts != "":
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 5c220c6..942ebdb 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -51,19 +51,19 @@ def get_config(*args, **kwargs):
 
 class TestKparamsMerge(MAASServerTestCase):
     def test_simple_merge(self):
-        expected_state = "a=b b=c"
+        expected_state = "b=c a=b"
         calculated_state = merge_kparams_with_extra("a=b", "b=c")
-        self.assertItemsEqual(expected_state, calculated_state)
+        self.assertEqual(expected_state, calculated_state)
 
     def test_override_merge(self):
-        expected_state = "a=b b=d"
+        expected_state = "b=d a=b"
         calculated_state = merge_kparams_with_extra("a=b b=c", "b=d")
-        self.assertItemsEqual(expected_state, calculated_state)
+        self.assertEqual(expected_state, calculated_state)
 
     def test_override_with_add_merge(self):
-        expected_state = "a=b b=d c=e"
+        expected_state = "b=d c=e a=b"
         calculated_state = merge_kparams_with_extra("a=b b=c", "b=d c=e")
-        self.assertItemsEqual(expected_state, calculated_state)
+        self.assertEqual(expected_state, calculated_state)
 
 
 class TestGetConfig(MAASServerTestCase):
@@ -1476,7 +1476,7 @@ class TestGetBootFilenames(MAASServerTestCase):
         )
 
     def test_returns_all_none_when_not_found(self):
-        self.assertItemsEqual(
+        self.assertEqual(
             (None, None, None),
             get_boot_filenames(
                 factory.make_name("arch"),
@@ -1487,7 +1487,7 @@ class TestGetBootFilenames(MAASServerTestCase):
         )
 
     def test_returns_all_none_when_not_found_and_generic(self):
-        self.assertItemsEqual(
+        self.assertEqual(
             (None, None, None),
             get_boot_filenames(
                 factory.make_name("arch"),
diff --git a/src/maasserver/rpc/tests/test_leases.py b/src/maasserver/rpc/tests/test_leases.py
index 134ecef..786c721 100644
--- a/src/maasserver/rpc/tests/test_leases.py
+++ b/src/maasserver/rpc/tests/test_leases.py
@@ -281,7 +281,7 @@ class TestUpdateLease(MAASServerTestCase):
                 updated=datetime.fromtimestamp(kwargs["timestamp"]),
             ),
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [boot_interface.id], sip.interface_set.values_list("id", flat=True)
         )
         self.assertEqual(
@@ -364,7 +364,7 @@ class TestUpdateLease(MAASServerTestCase):
                 updated=datetime.fromtimestamp(kwargs["timestamp"]),
             ),
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [boot_interface.id, bond_interface.id],
             sip.interface_set.values_list("id", flat=True),
         )
@@ -393,7 +393,7 @@ class TestUpdateLease(MAASServerTestCase):
             "DISCOVERED IP address shold have been created without an "
             "IP address.",
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [boot_interface.id], sip.interface_set.values_list("id", flat=True)
         )
 
@@ -421,7 +421,7 @@ class TestUpdateLease(MAASServerTestCase):
             "DISCOVERED IP address shold have been created without an "
             "IP address.",
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [boot_interface.id], sip.interface_set.values_list("id", flat=True)
         )
 
diff --git a/src/maasserver/rpc/tests/test_nodes.py b/src/maasserver/rpc/tests/test_nodes.py
index c509ff6..1aafe1f 100644
--- a/src/maasserver/rpc/tests/test_nodes.py
+++ b/src/maasserver/rpc/tests/test_nodes.py
@@ -17,9 +17,7 @@ from testtools.matchers import (
     Equals,
     GreaterThan,
     HasLength,
-    Is,
     LessThan,
-    Not,
 )
 
 from maasserver import ntp
@@ -91,8 +89,8 @@ class TestCreateNode(MAASTransactionServerTestCase):
         # Node will not have an auto-generated name because migrations are
         # not ran in the testing environment.
         # self.expectThat(node.hostname, Contains("-"))
-        self.expectThat(node.id, Not(Is(None)))
-        self.assertItemsEqual(
+        self.assertIsNotNone(node.id)
+        self.assertCountEqual(
             mac_addresses,
             [nic.mac_address for nic in node.interface_set.all()],
         )
@@ -117,8 +115,8 @@ class TestCreateNode(MAASTransactionServerTestCase):
                 node.hostname,
             ),
         )
-        self.expectThat(node.id, Not(Is(None)))
-        self.assertItemsEqual(
+        self.assertIsNotNone(node.id)
+        self.assertCountEqual(
             mac_addresses,
             [nic.mac_address for nic in node.interface_set.all()],
         )
@@ -168,8 +166,8 @@ class TestCreateNode(MAASTransactionServerTestCase):
                 node.hostname,
             ),
         )
-        self.expectThat(node.id, Not(Is(None)))
-        self.assertItemsEqual(
+        self.assertIsNotNone(node.id)
+        self.assertCountEqual(
             mac_addresses,
             [nic.mac_address for nic in node.interface_set.all()],
         )
@@ -425,7 +423,7 @@ class TestListClusterNodesPowerParameters(MAASServerTestCase):
         power_parameters = list_cluster_nodes_power_parameters(rack.system_id)
         system_ids = [params["system_id"] for params in power_parameters]
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             {node_unchecked.system_id, node_checked_long_ago.system_id},
             system_ids,
         )
@@ -444,7 +442,7 @@ class TestListClusterNodesPowerParameters(MAASServerTestCase):
         power_parameters = list_cluster_nodes_power_parameters(rack.system_id)
         system_ids = [params["system_id"] for params in power_parameters]
 
-        self.assertItemsEqual([node_queryable.system_id], system_ids)
+        self.assertEqual([node_queryable.system_id], system_ids)
 
     def test_excludes_no_power_type(self):
         rack = factory.make_RackController()
@@ -459,7 +457,7 @@ class TestListClusterNodesPowerParameters(MAASServerTestCase):
         power_parameters = list_cluster_nodes_power_parameters(rack.system_id)
         system_ids = [params["system_id"] for params in power_parameters]
 
-        self.assertItemsEqual([node_queryable.system_id], system_ids)
+        self.assertEqual([node_queryable.system_id], system_ids)
 
     def test_returns_checked_nodes_in_last_checked_order(self):
         rack = factory.make_RackController()
diff --git a/src/maasserver/rpc/tests/test_rackcontrollers.py b/src/maasserver/rpc/tests/test_rackcontrollers.py
index 4780096..d2174ce 100644
--- a/src/maasserver/rpc/tests/test_rackcontrollers.py
+++ b/src/maasserver/rpc/tests/test_rackcontrollers.py
@@ -59,7 +59,7 @@ class TestHandleUpgrade(MAASServerTestCase):
         vlan = reload_object(vlan)
         self.assertEqual(rack.system_id, vlan.primary_rack.system_id)
         self.assertTrue(vlan.dhcp_on)
-        self.assertItemsEqual([], NodeGroupToRackController.objects.all())
+        self.assertCountEqual([], NodeGroupToRackController.objects.all())
 
     def test_logs_migration(self):
         logger = self.useFixture(FakeLogger("maas"))
diff --git a/src/maasserver/rpc/tests/test_regionservice.py b/src/maasserver/rpc/tests/test_regionservice.py
index bb5b350..0d24aa8 100644
--- a/src/maasserver/rpc/tests/test_regionservice.py
+++ b/src/maasserver/rpc/tests/test_regionservice.py
@@ -912,7 +912,7 @@ class TestRegionService(MAASTestCase):
         conns_for_uuid.update({c1, c2})
 
         def check_choice(choices):
-            self.assertItemsEqual(choices, conns_for_uuid)
+            self.assertCountEqual(choices, conns_for_uuid)
             return chosen
 
         self.patch(random, "choice", check_choice)
diff --git a/src/maasserver/rpc/tests/test_regionservice_calls.py b/src/maasserver/rpc/tests/test_regionservice_calls.py
index 846fa3e..4d9d337 100644
--- a/src/maasserver/rpc/tests/test_regionservice_calls.py
+++ b/src/maasserver/rpc/tests/test_regionservice_calls.py
@@ -563,7 +563,7 @@ class TestRegionProtocol_ListNodePowerParameters(
         )
 
         self.maxDiff = None
-        self.assertItemsEqual(nodes, response["nodes"])
+        self.assertCountEqual(nodes, response["nodes"])
 
     @wait_for_reactor
     def test_raises_exception_if_nodegroup_doesnt_exist(self):
diff --git a/src/provisioningserver/rpc/tests/test_boot_images.py b/src/provisioningserver/rpc/tests/test_boot_images.py
index 531c83b..351cdb3 100644
--- a/src/provisioningserver/rpc/tests/test_boot_images.py
+++ b/src/provisioningserver/rpc/tests/test_boot_images.py
@@ -104,7 +104,7 @@ class TestGetHostsFromSources(MAASTestCase):
             # with brackets.
             if ":" in host:
                 hosts.add("[%s]" % host)
-        self.assertItemsEqual(hosts, get_hosts_from_sources(sources))
+        self.assertCountEqual(hosts, get_hosts_from_sources(sources))
 
 
 class TestFixSourcesForCluster(MAASTestCase):
@@ -227,7 +227,7 @@ class TestRunImport(MAASTestCase):
         sources, _ = make_sources()
         fake = self.patch_boot_resources_function()
         _run_import(sources=sources, maas_url=maas_url)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             fake.env["no_proxy"].split(","),
             [
                 "localhost",
diff --git a/src/provisioningserver/rpc/tests/test_clusterservice.py b/src/provisioningserver/rpc/tests/test_clusterservice.py
index 4a7fba0..89b2289 100644
--- a/src/provisioningserver/rpc/tests/test_clusterservice.py
+++ b/src/provisioningserver/rpc/tests/test_clusterservice.py
@@ -286,7 +286,7 @@ class TestClusterProtocol_ListBootImages(MAASTestCase):
         response = yield call_responder(Cluster(), cluster.ListBootImages, {})
 
         self.assertThat(response, KeysEqual("images"))
-        self.assertItemsEqual(expected_images, response["images"])
+        self.assertEqual(expected_images, response["images"])
 
 
 class TestClusterProtocol_ImportBootImages(MAASTestCase):
@@ -430,13 +430,12 @@ class TestClusterProtocol_DescribePowerTypes(MAASTestCase):
 
     @inlineCallbacks
     def test_describe_power_types_returns_jsonized_schema(self):
-
         response = yield call_responder(
             Cluster(), cluster.DescribePowerTypes, {}
         )
 
         self.assertThat(response, KeysEqual("power_types"))
-        self.assertItemsEqual(
+        self.assertEqual(
             PowerDriverRegistry.get_schema(detect_missing_packages=False),
             response["power_types"],
         )
@@ -934,7 +933,7 @@ class TestClusterClientService(MAASTestCase):
             call("host1:pid=2002", ("::ffff:1.1.1.1", 3333)),
             call("host2:pid=3003", ("::ffff:2.2.2.2", 5555)),
         ]
-        self.assertItemsEqual(
+        self.assertEqual(
             _make_connection_expected, _make_connection.call_args_list
         )
         self.assertEqual(
@@ -1312,7 +1311,7 @@ class TestClusterClientService(MAASTestCase):
         c2 = DummyConnection()
         service.connections[uuid2] = c2
         clients = service.getAllClients()
-        self.assertItemsEqual(clients, {common.Client(c1), common.Client(c2)})
+        self.assertEqual(clients, [common.Client(c1), common.Client(c2)])
 
     def test_getAllClients_when_there_are_no_connections(self):
         service = ClusterClientService(Clock())