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

[Adam Collard]

[provisioningserver] Replace defunct assertItemsEqual

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-assertItemsEqual-provisioningserver lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11004/console
COMMIT: 24be81a9f8d74ef6c496957501136ea4a806f5a9

review: Needs Fixing

7ee71e1... by Adam Collard on 2021-09-16

Fix order sensitive test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-assertItemsEqual-provisioningserver lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11007/console
COMMIT: 7ee71e19649a6df044dc2210dd8399209cbc0d28

review: Needs Fixing

[Alberto Donato (ack)]

minor nits inline

it seems some tests are failing because of expected ordering, though

3ad3aed... by Adam Collard on 2021-09-16

Address feedback from ack

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-assertItemsEqual-provisioningserver lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11009/console
COMMIT: 3ad3aed755c86da7791f007adc5b542db21d4f33

review: Needs Fixing

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/api/tests/test_raid.py b/src/maasserver/api/tests/test_raid.py
index e174cfd..832d9f5 100644
--- a/src/maasserver/api/tests/test_raid.py
+++ b/src/maasserver/api/tests/test_raid.py
@@ -231,7 +231,7 @@ class TestRaidsAPI(APITestCase.ForUser):
             (10 * PART_SIZE) - RAID_SUPERBLOCK_OVERHEAD, parsed_device["size"]
         )
         self.assertEqual(uuid4, parsed_device["uuid"])
-        self.assertEqual(block_devices, parsed_block_devices)
+        self.assertCountEqual(block_devices, parsed_block_devices)
         self.assertCountEqual(partitions, parsed_partitions)
         self.assertEqual([], parsed_block_device_spares)
         self.assertEqual([], parsed_partition_spares)
@@ -323,7 +323,7 @@ class TestRaidsAPI(APITestCase.ForUser):
             PART_SIZE - RAID_SUPERBLOCK_OVERHEAD, parsed_device["size"]
         )
         self.assertEqual(uuid4, parsed_device["uuid"])
-        self.assertEqual(block_devices, parsed_block_devices)
+        self.assertCountEqual(block_devices, parsed_block_devices)
         self.assertCountEqual(partitions, parsed_partitions)
         self.assertEqual([], parsed_block_device_spares)
         self.assertEqual([], parsed_partition_spares)
@@ -379,7 +379,7 @@ class TestRaidsAPI(APITestCase.ForUser):
             PART_SIZE - RAID_SUPERBLOCK_OVERHEAD, parsed_device["size"]
         )
         self.assertEqual(uuid4, parsed_device["uuid"])
-        self.assertEqual(block_devices, parsed_block_devices)
+        self.assertCountEqual(block_devices, parsed_block_devices)
         self.assertCountEqual(partitions, parsed_partitions)
         self.assertEqual(spare_devices, parsed_block_device_spares)
         self.assertEqual(spare_partitions, parsed_partition_spares)
@@ -438,7 +438,7 @@ class TestRaidsAPI(APITestCase.ForUser):
             (7 * large_partitions[0].size) - RAID_SUPERBLOCK_OVERHEAD,
             parsed_device["size"],
         )
-        self.assertEqual(block_devices, parsed_block_devices)
+        self.assertCountEqual(block_devices, parsed_block_devices)
         self.assertCountEqual(partitions, parsed_partitions)
         self.assertEqual(spare_devices, parsed_block_device_spares)
         self.assertEqual(spare_partitions, parsed_partition_spares)
@@ -498,7 +498,7 @@ class TestRaidsAPI(APITestCase.ForUser):
             (6 * large_partitions[0].size) - RAID_SUPERBLOCK_OVERHEAD,
             parsed_device["size"],
         )
-        self.assertEqual(block_devices, parsed_block_devices)
+        self.assertCountEqual(block_devices, parsed_block_devices)
         self.assertCountEqual(partitions, parsed_partitions)
         self.assertEqual(spare_devices, parsed_block_device_spares)
         self.assertEqual(spare_partitions, parsed_partition_spares)
@@ -558,7 +558,7 @@ class TestRaidsAPI(APITestCase.ForUser):
             (4 * large_partitions[0].size) - RAID_SUPERBLOCK_OVERHEAD,
             parsed_device["size"],
         )
-        self.assertEqual(block_devices, parsed_block_devices)
+        self.assertCountEqual(block_devices, parsed_block_devices)
         self.assertCountEqual(partitions, parsed_partitions)
         self.assertEqual(spare_devices, parsed_block_device_spares)
         self.assertEqual(spare_partitions, parsed_partition_spares)
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 0b31991..61c2069 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -324,9 +324,8 @@ class TestNodeGetLatestScriptResults(MAASServerTestCase):
                 factory.make_ScriptResult(script=script, script_set=script_set)
             )
 
-        self.assertEqual(
-            sorted(latest_script_results, key=lambda x: x.name),
-            list(node.get_latest_script_results),
+        self.assertCountEqual(
+            latest_script_results, node.get_latest_script_results
         )
 
     def test_get_latest_script_results_storage(self):
@@ -403,9 +402,8 @@ class TestNodeGetLatestScriptResults(MAASServerTestCase):
             if script.script_type == SCRIPT_TYPE.COMMISSIONING:
                 latest_script_results.append(script_result)
 
-        self.assertEqual(
-            sorted(latest_script_results, key=lambda x: x.name),
-            list(node.get_latest_commissioning_script_results),
+        self.assertCountEqual(
+            latest_script_results, node.get_latest_commissioning_script_results
         )
 
     def test_get_latest_testing_script_results(self):
@@ -428,9 +426,8 @@ class TestNodeGetLatestScriptResults(MAASServerTestCase):
             if script.script_type == SCRIPT_TYPE.TESTING:
                 latest_script_results.append(script_result)
 
-        self.assertEqual(
-            sorted(latest_script_results, key=lambda x: x.name),
-            list(node.get_latest_testing_script_results),
+        self.assertCountEqual(
+            latest_script_results, node.get_latest_testing_script_results
         )
 
     def test_get_latest_installation_script_results(self):
diff --git a/src/provisioningserver/boot/tests/test_tftppath.py b/src/provisioningserver/boot/tests/test_tftppath.py
index b3e0f81..1242688 100644
--- a/src/provisioningserver/boot/tests/test_tftppath.py
+++ b/src/provisioningserver/boot/tests/test_tftppath.py
@@ -148,7 +148,7 @@ class TestTFTPPath(MAASTestCase):
         self.make_image_dir(params, self.tftproot)
         purposes = ["install", "commissioning", "xinstall"]
         make_osystem(self, params["osystem"], purposes)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [make_image(params, purpose) for purpose in purposes],
             list_boot_images(self.tftproot),
         )
@@ -159,7 +159,7 @@ class TestTFTPPath(MAASTestCase):
         for param in params:
             self.make_image_dir(param, self.tftproot)
             make_osystem(self, param["osystem"], purposes)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 make_image(param, purpose)
                 for param in params
@@ -178,7 +178,7 @@ class TestTFTPPath(MAASTestCase):
         make_osystem(self, params["osystem"], purposes)
         # The API requires "supported_subarches".
         expected_metadata = dict(supported_subarches=metadata["subarches"])
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 make_image(params, purpose, expected_metadata)
                 for purpose in purposes
@@ -190,7 +190,7 @@ class TestTFTPPath(MAASTestCase):
         params = [make_boot_image_storage_params() for counter in range(3)]
         for param in params:
             self.make_image_dir(param, self.tftproot)
-        self.assertItemsEqual([], list_boot_images(self.tftproot))
+        self.assertEqual([], list_boot_images(self.tftproot))
 
     def test_is_visible_subdir_ignores_regular_files(self):
         plain_file = self.make_file()
@@ -213,14 +213,14 @@ class TestTFTPPath(MAASTestCase):
         self.assertTrue(is_visible_subdir(base_dir, subdir))
 
     def test_list_subdirs_lists_empty_directory(self):
-        self.assertItemsEqual([], list_subdirs(self.make_dir()))
+        self.assertEqual([], list_subdirs(self.make_dir()))
 
     def test_list_subdirs_lists_subdirs(self):
         base_dir = self.make_dir()
         factory.make_file(base_dir, factory.make_name("plain-file"))
         subdir = factory.make_name("subdir")
         os.makedirs(os.path.join(base_dir, subdir))
-        self.assertItemsEqual([subdir], list_subdirs(base_dir))
+        self.assertEqual([subdir], list_subdirs(base_dir))
 
     def test_extend_path_finds_path_extensions(self):
         base_dir = self.make_dir()
@@ -229,7 +229,7 @@ class TestTFTPPath(MAASTestCase):
         ]
         for subdir in subdirs:
             os.makedirs(os.path.join(base_dir, subdir))
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [[os.path.basename(base_dir), subdir] for subdir in subdirs],
             extend_path(
                 os.path.dirname(base_dir), [os.path.basename(base_dir)]
@@ -246,7 +246,7 @@ class TestTFTPPath(MAASTestCase):
         )
 
     def test_extend_path_stops_if_no_subdirs_found(self):
-        self.assertItemsEqual([], extend_path(self.make_dir(), []))
+        self.assertCountEqual([], extend_path(self.make_dir(), []))
 
     def test_drill_down_follows_directory_tree(self):
         base_dir = self.make_dir()
@@ -257,7 +257,7 @@ class TestTFTPPath(MAASTestCase):
         ]
         for subdir in subdirs:
             os.makedirs(os.path.join(base_dir, lower_dir, subdir))
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [[lower_dir, subdir] for subdir in subdirs],
             drill_down(base_dir, [[lower_dir]]),
         )
@@ -270,7 +270,7 @@ class TestTFTPPath(MAASTestCase):
         relevant_subdir = factory.make_name("subdir")
         os.makedirs(os.path.join(base_dir, irrelevant_dir, irrelevant_subdir))
         os.makedirs(os.path.join(base_dir, relevant_dir, relevant_subdir))
-        self.assertEqual(
+        self.assertCountEqual(
             [[relevant_dir, relevant_subdir]],
             drill_down(base_dir, [[relevant_dir]]),
         )
@@ -391,7 +391,7 @@ class TestTFTPPath(MAASTestCase):
 
         params = extract_image_params(path, "")
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 {
                     "osystem": osystem,
@@ -458,7 +458,7 @@ class TestTFTPPath(MAASTestCase):
 
         params = extract_image_params(path, maas_meta)
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 {
                     "osystem": osystem,
@@ -504,7 +504,7 @@ class TestTFTPPath(MAASTestCase):
 
         params = extract_image_params(path, "")
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 {
                     "osystem": "bootloader",
@@ -537,7 +537,7 @@ class TestTFTPPath(MAASTestCase):
 
         params = extract_image_params(path, "")
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 {
                     "osystem": osystem,
@@ -604,7 +604,7 @@ class TestTFTPPath(MAASTestCase):
 
         params = extract_image_params(path, maas_meta)
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 {
                     "osystem": osystem,
diff --git a/src/provisioningserver/dhcp/tests/test_config.py b/src/provisioningserver/dhcp/tests/test_config.py
index fdbbb53..1b4f654 100644
--- a/src/provisioningserver/dhcp/tests/test_config.py
+++ b/src/provisioningserver/dhcp/tests/test_config.py
@@ -344,7 +344,7 @@ class TestGetConfig(MAASTestCase):
             )
             for server in server_line.split(", ")
         ]
-        self.assertItemsEqual(ntp_servers_expected, ntp_servers_observed)
+        self.assertCountEqual(ntp_servers_expected, ntp_servers_observed)
 
     def test_renders_without_ntp_servers_set(self):
         params = make_sample_params(self, ipv6=self.ipv6)
@@ -373,7 +373,7 @@ class TestGetConfig(MAASTestCase):
             )
             for server in server_line.split(", ")
         ]
-        self.assertItemsEqual(ntp_servers_expected, ntp_servers_observed)
+        self.assertCountEqual(ntp_servers_expected, ntp_servers_observed)
 
     def test_renders_router_ip_if_present(self):
         params = make_sample_params(self, ipv6=self.ipv6)
diff --git a/src/provisioningserver/dns/tests/test_zoneconfig.py b/src/provisioningserver/dns/tests/test_zoneconfig.py
index 97c8f95..767b947 100644
--- a/src/provisioningserver/dns/tests/test_zoneconfig.py
+++ b/src/provisioningserver/dns/tests/test_zoneconfig.py
@@ -136,7 +136,7 @@ class TestDNSForwardZoneConfig(MAASTestCase):
         ]
         expect = [(n, t, ip) for n, t, ip in expected]
         actual = DNSForwardZoneConfig.get_A_mapping(combined_mapping, ns_ttl)
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
     def test_get_aaaa_mapping_returns_ipv6_mapping(self):
         ttl = random.randint(10, 300)
@@ -163,7 +163,7 @@ class TestDNSForwardZoneConfig(MAASTestCase):
                 ipv4_mapping.items(), ipv6_mapping.items()
             )
         }
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 (n, info.ttl, ip)
                 for n, info in ipv6_mapping.items()
@@ -489,7 +489,7 @@ class TestDNSReverseZoneConfig(MAASTestCase):
         # And that the zone names chosen for each element are correct.
         for net in range(len(expected)):
             for zi in range(len(expected[net][1])):
-                self.assertItemsEqual(
+                self.assertCountEqual(
                     expected[net][1][zi].zone_name,
                     results[net][1][zi].zone_name,
                 )
@@ -589,7 +589,7 @@ class TestDNSReverseZoneConfig(MAASTestCase):
             "%s.%s" % (hostname, name): HostnameIPMapping(None, 30, {ip})
             for hostname, ip in hosts.items()
         }
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected, DNSReverseZoneConfig.get_PTR_mapping(mapping, network)
         )
 
@@ -617,7 +617,7 @@ class TestDNSReverseZoneConfig(MAASTestCase):
             factory.make_string(): HostnameIPMapping(None, 30, ["192.70.0.2"]),
         }
         mapping.update(extra_mapping)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected, DNSReverseZoneConfig.get_PTR_mapping(mapping, network)
         )
 
@@ -756,7 +756,7 @@ class TestDNSReverseZoneConfig_GetGenerateDirectives(MAASTestCase):
             ("0-255", "$.1.168.192.in-addr.arpa.", "192-168-1-$.domain."),
             ("0-128", "$.2.168.192.in-addr.arpa.", "192-168-2-$.domain."),
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_directives,
             DNSReverseZoneConfig.get_GENERATE_directives(
                 ip_range,
@@ -826,7 +826,7 @@ class TestDNSReverseZoneConfig_GetGenerateDirectives(MAASTestCase):
             network, domain, DomainInfo(network, reverse)
         )
         self.expectThat(directives, HasLength(1))
-        self.assertItemsEqual(expected_generate_directives, directives)
+        self.assertCountEqual(expected_generate_directives, directives)
 
     def test_returns_single_entry_for_tiny_network(self):
         network = IPNetwork("%s/28" % factory.make_ipv4_address())
@@ -841,7 +841,7 @@ class TestDNSReverseZoneConfig_GetGenerateDirectives(MAASTestCase):
             network, domain, DomainInfo(network, reverse)
         )
         self.expectThat(directives, HasLength(1))
-        self.assertItemsEqual(expected_generate_directives, directives)
+        self.assertCountEqual(expected_generate_directives, directives)
 
     def test_returns_single_entry_for_weird_small_range(self):
         ip_range = IPRange("10.0.0.1", "10.0.0.255")
@@ -867,7 +867,7 @@ class TestDNSReverseZoneConfig_GetGenerateDirectives(MAASTestCase):
             network, domain, DomainInfo(network, reverse)
         )
         self.expectThat(directives, HasLength(256))
-        self.assertItemsEqual(expected_generate_directives, directives)
+        self.assertCountEqual(expected_generate_directives, directives)
 
     def test_ignores_network_larger_than_slash_16(self):
         network = IPNetwork("%s/15" % factory.make_ipv4_address())
@@ -939,7 +939,7 @@ class TestDNSForwardZoneConfig_GetGenerateDirectives(MAASTestCase):
             ("0-255", "192-168-1-$", "192.168.1.$"),
             ("0-128", "192-168-2-$", "192.168.2.$"),
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_directives,
             DNSForwardZoneConfig.get_GENERATE_directives(ip_range),
         )
@@ -982,7 +982,7 @@ class TestDNSForwardZoneConfig_GetGenerateDirectives(MAASTestCase):
         expected_directives = self.get_expected_generate_directives(network)
         directives = DNSForwardZoneConfig.get_GENERATE_directives(network)
         self.expectThat(directives, HasLength(1))
-        self.assertItemsEqual(expected_directives, directives)
+        self.assertCountEqual(expected_directives, directives)
 
     def test_returns_single_entry_for_tiny_network(self):
         network = IPNetwork("%s/31" % factory.make_ipv4_address())
@@ -990,7 +990,7 @@ class TestDNSForwardZoneConfig_GetGenerateDirectives(MAASTestCase):
         expected_directives = self.get_expected_generate_directives(network)
         directives = DNSForwardZoneConfig.get_GENERATE_directives(network)
         self.assertEqual(1, len(expected_directives))
-        self.assertItemsEqual(expected_directives, directives)
+        self.assertCountEqual(expected_directives, directives)
 
     def test_returns_two_entries_for_slash_23_network(self):
         network = IPNetwork("%s/23" % factory.make_ipv4_address())
@@ -998,7 +998,7 @@ class TestDNSForwardZoneConfig_GetGenerateDirectives(MAASTestCase):
         expected_directives = self.get_expected_generate_directives(network)
         directives = DNSForwardZoneConfig.get_GENERATE_directives(network)
         self.assertEqual(2, len(expected_directives))
-        self.assertItemsEqual(expected_directives, directives)
+        self.assertCountEqual(expected_directives, directives)
 
     def test_dtrt_for_larger_networks(self):
         # For every other network size that we're not explicitly
diff --git a/src/provisioningserver/drivers/hardware/tests/test_ucsm.py b/src/provisioningserver/drivers/hardware/tests/test_ucsm.py
index 571fe68..9493407 100644
--- a/src/provisioningserver/drivers/hardware/tests/test_ucsm.py
+++ b/src/provisioningserver/drivers/hardware/tests/test_ucsm.py
@@ -1,9 +1,6 @@
 # Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for ``provisioningserver.drivers.hardware.ucsm``."""
-
-
 from io import StringIO
 from itertools import permutations
 import random
@@ -86,8 +83,6 @@ def make_server(power_state=None):
 
 
 class TestUCSMXMLAPIError(MAASTestCase):
-    """Tests for ``UCSM_XML_API_Error``."""
-
     def test_includes_code_and_msg(self):
         def raise_error():
             raise UCSM_XML_API_Error("bad", 4224)
@@ -99,8 +94,6 @@ class TestUCSMXMLAPIError(MAASTestCase):
 
 
 class TestMakeRequestData(MAASTestCase):
-    """Tests for ``make_request_data``."""
-
     def test_no_children(self):
         fields = {"hello": "there"}
         request_data = make_request_data("foo", fields)
@@ -115,7 +108,7 @@ class TestMakeRequestData(MAASTestCase):
         request_data = make_request_data("foo", fields, children)
         root = XML(request_data)
         self.assertEqual("foo", root.tag)
-        self.assertItemsEqual(children_tags, (e.tag for e in root))
+        self.assertEqual(children_tags, [e.tag for e in root])
 
     def test_no_fields(self):
         request_data = make_request_data("foo")
@@ -124,8 +117,6 @@ class TestMakeRequestData(MAASTestCase):
 
 
 class TestParseResonse(MAASTestCase):
-    """Tests for ``parse_response``."""
-
     def test_no_error(self):
         xml = "<foo/>"
         response = parse_response(xml)
@@ -137,8 +128,6 @@ class TestParseResonse(MAASTestCase):
 
 
 class TestLogin(MAASTestCase):
-    """"Tests for ``UCSM_XML_API.login``."""
-
     def test_login_assigns_cookie(self):
         cookie = "chocolate chip"
         api, mock = make_api_patch_call(self)
@@ -156,8 +145,6 @@ class TestLogin(MAASTestCase):
 
 
 class TestLogout(MAASTestCase):
-    """"Tests for ``UCSM_XML_API.logout``."""
-
     def test_logout_clears_cookie(self):
         api = make_api()
         self.patch(api, "_call")
@@ -173,8 +160,6 @@ class TestLogout(MAASTestCase):
 
 
 class TestConfigResolveClass(MAASTestCase):
-    """"Tests for ``UCSM_XML_API.config_resolve_class``."""
-
     def test_no_filters(self):
         class_id = make_class()
         api, mock = make_api_patch_call(self)
@@ -200,8 +185,6 @@ class TestConfigResolveClass(MAASTestCase):
 
 
 class TestConfigResolveChildren(MAASTestCase):
-    """"Tests for ``UCSM_XML_API.config_resolve_children``."""
-
     def test_parameters(self):
         dn = make_dn()
         class_id = make_class()
@@ -229,8 +212,6 @@ class TestConfigResolveChildren(MAASTestCase):
 
 
 class TestConfigConfMo(MAASTestCase):
-    """"Tests for ``UCSM_XML_API.config_conf_mo``."""
-
     def test_parameters(self):
         dn = make_dn()
         config_items = [Element("hi")]
@@ -243,8 +224,6 @@ class TestConfigConfMo(MAASTestCase):
 
 
 class TestCall(MAASTestCase):
-    """"Tests for ``UCSM_XML_API._call``."""
-
     def test_call(self):
         name = "method"
         fields = {1: 2}
@@ -267,8 +246,6 @@ class TestCall(MAASTestCase):
 
 
 class TestSendRequest(MAASTestCase):
-    """"Tests for ``UCSM_XML_API._send_request``."""
-
     def test_send_request(self):
         request_data = "foo"
         api = make_api()
@@ -283,8 +260,6 @@ class TestSendRequest(MAASTestCase):
 
 
 class TestConfigResolveDn(MAASTestCase):
-    """Tests for ``UCSM_XML_API.config_resolve_dn``."""
-
     def test_parameters(self):
         api, mock = make_api_patch_call(self)
         test_dn = make_dn()
@@ -294,8 +269,6 @@ class TestConfigResolveDn(MAASTestCase):
 
 
 class TestGetServers(MAASTestCase):
-    """Tests for ``get_servers``."""
-
     def test_uses_uuid(self):
         uuid = factory.make_UUID()
         api = make_api()
@@ -322,8 +295,6 @@ class TestGetServers(MAASTestCase):
 
 
 class TestProbeLanBootOptions(MAASTestCase):
-    """Tests for ``probe_lan_boot_options``."""
-
     def test_returns_result(self):
         api = make_api()
         server = sentinel.server
@@ -350,8 +321,6 @@ class TestProbeLanBootOptions(MAASTestCase):
 
 
 class TestGetChildren(MAASTestCase):
-    """Tests for ``get_children``."""
-
     def test_returns_result(self):
         search_class = make_class()
         api = make_api()
@@ -374,8 +343,6 @@ class TestGetChildren(MAASTestCase):
 
 
 class TestGetMacs(MAASTestCase):
-    """Tests for ``get_macs``."""
-
     def test_gets_adaptors(self):
         adaptor = "adaptor"
         server = make_server()
@@ -402,8 +369,6 @@ class TestGetMacs(MAASTestCase):
 
 
 class TestProbeServers(MAASTestCase):
-    """Tests for ``probe_servers``."""
-
     def test_uses_api(self):
         api = make_api()
         mock = self.patch(ucsm, "get_servers")
@@ -441,8 +406,6 @@ class TestProbeServers(MAASTestCase):
 
 
 class TestGetServerPowerControl(MAASTestCase):
-    """Tests for ``get_server_power_control``."""
-
     def test_get_server_power_control(self):
         api = make_api()
         mock = self.patch(api, "config_resolve_children")
@@ -456,8 +419,6 @@ class TestGetServerPowerControl(MAASTestCase):
 
 
 class TestSetServerPowerControl(MAASTestCase):
-    """Tests for ``set_server_power_control``."""
-
     def test_set_server_power_control(self):
         api = make_api()
         power_dn = make_dn()
@@ -472,8 +433,6 @@ class TestSetServerPowerControl(MAASTestCase):
 
 
 class TestLoggedIn(MAASTestCase):
-    """Tests for ``logged_in``."""
-
     def test_logged_in(self):
         mock = self.patch(ucsm, "UCSM_XML_API")
         url = "url"
@@ -521,8 +480,6 @@ class TestInvalidGetPowerCommand(MAASTestCase):
 
 
 class TestPowerControlUCSM(MAASTestCase):
-    """Tests for ``power_control_ucsm``."""
-
     def test_power_control_ucsm(self):
         uuid = factory.make_UUID()
         api = Mock()
@@ -548,8 +505,6 @@ class TestPowerControlUCSM(MAASTestCase):
 
 
 class TestUCSMPowerState(MAASTestCase):
-    """Tests for `power_state_ucsm`."""
-
     def test_power_state_get_off(self):
         url = factory.make_name("url")
         username = factory.make_name("username")
@@ -594,7 +549,6 @@ class TestUCSMPowerState(MAASTestCase):
 
 
 class TestProbeAndEnlistUCSM(MAASTestCase):
-    """Tests for ``probe_and_enlist_ucsm``."""
 
     run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
 
@@ -640,8 +594,6 @@ class TestProbeAndEnlistUCSM(MAASTestCase):
 
 
 class TestGetServiceProfile(MAASTestCase):
-    """Tests for ``get_service_profile.``"""
-
     def test_get_service_profile(self):
         test_dn = make_dn()
         server = Element("computeBlade", {"assignedToDn": test_dn})
@@ -676,7 +628,6 @@ def make_boot_order_scenarios(size):
 
 
 class TestGetFirstBooter(MAASTestCase):
-    """Tests for ``get_first_booter.``"""
 
     scenarios, minimum = make_boot_order_scenarios(3)
 
@@ -690,8 +641,6 @@ class TestGetFirstBooter(MAASTestCase):
 
 
 class TestsForStripRoKeys(MAASTestCase):
-    """Tests for ``strip_ro_keys.``"""
-
     def test_strip_ro_keys(self):
         attributes = {key: "DC" for key in RO_KEYS}
 
@@ -709,8 +658,6 @@ class TestsForStripRoKeys(MAASTestCase):
 
 
 class TestMakePolicyChange(MAASTestCase):
-    """Tests for ``make_policy_change``."""
-
     def test_lan_already_top_priority(self):
         boot_profile_response = make_fake_result(
             "configResolveChildren", "lsbootLan"
@@ -738,8 +685,6 @@ class TestMakePolicyChange(MAASTestCase):
 
 
 class TestSetLanBootDefault(MAASTestCase):
-    """Tets for ``set_lan_boot_default.``"""
-
     def test_no_change(self):
         api = make_api()
         server = make_server()
diff --git a/src/provisioningserver/drivers/hardware/tests/test_virsh.py b/src/provisioningserver/drivers/hardware/tests/test_virsh.py
index 6abcc41..c665a06 100644
--- a/src/provisioningserver/drivers/hardware/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/hardware/tests/test_virsh.py
@@ -191,14 +191,14 @@ class TestVirshSSH(MAASTestCase):
         names = [factory.make_name("machine") for _ in range(3)]
         conn = self.configure_virshssh("\n".join(names))
         expected = conn.list()
-        self.assertItemsEqual(names, expected)
+        self.assertEqual(names, expected)
 
     def test_list_dom_prefix(self):
         prefix = "dom_prefix"
         names = [prefix + factory.make_name("machine") for _ in range(3)]
         conn = self.configure_virshssh("\n".join(names), dom_prefix=prefix)
         expected = conn.list()
-        self.assertItemsEqual(names, expected)
+        self.assertEqual(names, expected)
 
     def test_get_state(self):
         state = factory.make_name("state")
diff --git a/src/provisioningserver/drivers/osystem/tests/test_base.py b/src/provisioningserver/drivers/osystem/tests/test_base.py
index 1ec1654..851b714 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_base.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_base.py
@@ -55,7 +55,7 @@ class TestOperatingSystem(MAASTestCase):
     def test_format_release_choices(self):
         osystem = self.make_usable_osystem()
         releases = osystem.get_supported_releases()
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(release, release) for release in releases],
             osystem.format_release_choices(releases),
         )
@@ -72,7 +72,7 @@ class TestOperatingSystem(MAASTestCase):
         osystem = self.make_usable_osystem()
         images = self.configure_list_boot_images_for(osystem)
         releases = {image["release"] for image in images}
-        self.assertItemsEqual(releases, osystem.gen_supported_releases())
+        self.assertCountEqual(releases, osystem.gen_supported_releases())
 
     def test_get_xinstall_parameters(self):
         # The base OperatingSystems class should only look for root-tgz,
@@ -90,7 +90,7 @@ class TestOperatingSystem(MAASTestCase):
         for fname in ["squashfs", "root-tgz", "root-dd"]:
             factory.make_file(dir_path, fname)
         self.useFixture(ClusterConfigurationFixture(tftp_root=tmpdir))
-        self.assertItemsEqual(
+        self.assertEqual(
             ("root-tgz", "tgz"),
             osystem.get_xinstall_parameters(arch, subarch, release, label),
         )
@@ -265,7 +265,7 @@ class TestFindImage(MAASTestCase):
         if self.fname:
             factory.make_file(dir_path, self.fname)
         self.useFixture(ClusterConfigurationFixture(tftp_root=tmpdir))
-        self.assertItemsEqual(
+        self.assertEqual(
             self.expected,
             osystem._find_image(
                 arch,
@@ -286,7 +286,7 @@ class TestOperatingSystemRegistry(MAASTestCase):
         self.useFixture(RegistryFixture())
 
     def test_operating_system_registry(self):
-        self.assertItemsEqual([], OperatingSystemRegistry)
+        self.assertEqual([], list(OperatingSystemRegistry))
         OperatingSystemRegistry.register_item("resource", sentinel.resource)
         self.assertIn(
             sentinel.resource, (item for name, item in OperatingSystemRegistry)
diff --git a/src/provisioningserver/drivers/osystem/tests/test_bootloader.py b/src/provisioningserver/drivers/osystem/tests/test_bootloader.py
index b834670..c240f72 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_bootloader.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_bootloader.py
@@ -22,7 +22,7 @@ class TestCustomOS(MAASTestCase):
 
     def test_get_boot_image_purposes(self):
         osystem = BootLoaderOS()
-        self.assertItemsEqual(
+        self.assertEqual(
             [BOOT_IMAGE_PURPOSE.BOOTLOADER],
             osystem.get_boot_image_purposes(
                 factory.make_name("arch"),
diff --git a/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py b/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py
index 956b245..50d05ea 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py
@@ -61,7 +61,7 @@ class TestUbuntuCoreOS(MAASTestCase):
 
     def test_get_xinstall_parameters_default(self):
         osystem = UbuntuCoreOS()
-        self.assertItemsEqual(
+        self.assertEqual(
             ("root-dd.xz", "dd-xz"),
             osystem.get_xinstall_parameters(
                 factory.make_name("arch"),
diff --git a/src/provisioningserver/drivers/osystem/tests/test_windows.py b/src/provisioningserver/drivers/osystem/tests/test_windows.py
index 92f7e9a..fb439b7 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_windows.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_windows.py
@@ -25,7 +25,7 @@ class TestWindowsOS(MAASTestCase):
         subarch = factory.make_name("subarch")
         release = factory.make_name("release")
         label = factory.make_name("label")
-        self.assertItemsEqual(
+        self.assertEqual(
             [BOOT_IMAGE_PURPOSE.XINSTALL],
             osystem.get_boot_image_purposes(arch, subarch, release, label),
         )
@@ -112,16 +112,16 @@ class TestWindowsOS(MAASTestCase):
         node = self.make_node()
         token = self.make_token()
         url = factory.make_name("url")
-        required_keys = [
+        required_keys = {
             "maas_metadata_url",
             "maas_oauth_consumer_secret",
             "maas_oauth_consumer_key",
             "maas_oauth_token_key",
             "maas_oauth_token_secret",
             "hostname",
-        ]
+        }
         preseed = osystem.compose_preseed("default", node, token, url)
-        self.assertItemsEqual(required_keys, preseed.keys())
+        self.assertEqual(required_keys, preseed.keys())
 
     def test_compose_preseed_uses_only_hostname(self):
         osystem = WindowsOS()
diff --git a/src/provisioningserver/drivers/pod/tests/test_lxd.py b/src/provisioningserver/drivers/pod/tests/test_lxd.py
index 62d3405..7850b00 100644
--- a/src/provisioningserver/drivers/pod/tests/test_lxd.py
+++ b/src/provisioningserver/drivers/pod/tests/test_lxd.py
@@ -466,7 +466,7 @@ class TestLXDPodDriver(MAASTestCase):
         self.assertEqual(["amd64/generic"], discovered_pod.architectures)
         self.assertEqual("lxd-server", discovered_pod.name)
         self.assertEqual(discovered_pod.version, "4.1")
-        self.assertItemsEqual([mac_address], discovered_pod.mac_addresses)
+        self.assertEqual([mac_address], discovered_pod.mac_addresses)
         self.assertEqual(-1, discovered_pod.cores)
         self.assertEqual(-1, discovered_pod.cpu_speed)
         self.assertEqual(-1, discovered_pod.memory)
@@ -474,7 +474,7 @@ class TestLXDPodDriver(MAASTestCase):
         self.assertEqual(-1, discovered_pod.hints.cores)
         self.assertEqual(-1, discovered_pod.hints.cpu_speed)
         self.assertEqual(-1, discovered_pod.hints.local_storage)
-        self.assertItemsEqual(
+        self.assertEqual(
             [
                 Capabilities.COMPOSABLE,
                 Capabilities.DYNAMIC_LOCAL_STORAGE,
diff --git a/src/provisioningserver/drivers/pod/tests/test_registry.py b/src/provisioningserver/drivers/pod/tests/test_registry.py
index c4c9b15..b3eca04 100644
--- a/src/provisioningserver/drivers/pod/tests/test_registry.py
+++ b/src/provisioningserver/drivers/pod/tests/test_registry.py
@@ -19,7 +19,7 @@ class TestPodDriverRegistry(MAASTestCase):
         self.useFixture(RegistryFixture())
 
     def test_registry(self):
-        self.assertItemsEqual([], PodDriverRegistry)
+        self.assertEqual([], list(PodDriverRegistry))
         PodDriverRegistry.register_item("driver", sentinel.driver)
         self.assertIn(
             sentinel.driver, (item for name, item in PodDriverRegistry)
@@ -30,7 +30,7 @@ class TestPodDriverRegistry(MAASTestCase):
         fake_driver_two = make_pod_driver_base()
         PodDriverRegistry.register_item(fake_driver_one.name, fake_driver_one)
         PodDriverRegistry.register_item(fake_driver_two.name, fake_driver_two)
-        self.assertItemsEqual(
+        self.assertEqual(
             [
                 {
                     "driver_type": "pod",
diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index 79ebded..8a63418 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -665,7 +665,7 @@ class TestVirshSSH(MAASTestCase):
         expected = (("br0", "e1000"), ("br1", "e1000"))
         conn = self.configure_virshssh("")
         values = conn._get_column_values(SAMPLE_IFLIST, keys)
-        self.assertItemsEqual(values, expected)
+        self.assertEqual(values, expected)
 
     def test_get_key_value(self):
         key = "CPU model"
@@ -698,31 +698,31 @@ class TestVirshSSH(MAASTestCase):
         names = [factory.make_name("machine") for _ in range(3)]
         conn = self.configure_virshssh("\n".join(names))
         expected = conn.list_machines()
-        self.assertItemsEqual(names, expected)
+        self.assertEqual(names, expected)
 
     def test_list_machines_with_dom_prefix(self):
         prefix = "dom_prefix"
         names = [prefix + factory.make_name("machine") for _ in range(3)]
         conn = self.configure_virshssh("\n".join(names), dom_prefix=prefix)
         expected = conn.list_machines()
-        self.assertItemsEqual(names, expected)
+        self.assertEqual(names, expected)
 
     def test_list_pools(self):
         names = ["default", "ubuntu"]
         conn = self.configure_virshssh(SAMPLE_POOLLIST)
         expected = conn.list_pools()
-        self.assertItemsEqual(names, expected)
+        self.assertEqual(names, expected)
 
     def test_list_machine_block_devices(self):
-        block_devices = (
+        block_devices = [
             ("vda", "/var/lib/libvirt/images/example1.qcow2"),
             ("vdb", "/var/lib/libvirt/images/example2.qcow2"),
-        )
+        ]
         conn = self.configure_virshssh(SAMPLE_DOMBLKLIST)
         expected = conn.list_machine_block_devices(
             factory.make_name("machine")
         )
-        self.assertItemsEqual(block_devices, expected)
+        self.assertEqual(block_devices, expected)
 
     def test_get_machine_state(self):
         state = factory.make_name("state")
@@ -1086,13 +1086,13 @@ class TestVirshSSH(MAASTestCase):
         self.assertEqual(architecture, discovered_machine.architecture)
         self.assertEqual(cores, discovered_machine.cores)
         self.assertEqual(memory, discovered_machine.memory)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             local_storage, [bd.size for bd in discovered_machine.block_devices]
         )
-        self.assertItemsEqual(
+        self.assertEqual(
             device_tags, [bd.tags for bd in discovered_machine.block_devices]
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             mac_addresses,
             [m.mac_address for m in discovered_machine.interfaces],
         )
@@ -1194,13 +1194,13 @@ class TestVirshSSH(MAASTestCase):
         self.assertEqual(architecture, discovered_machine.architecture)
         self.assertEqual(cores, discovered_machine.cores)
         self.assertEqual(memory, discovered_machine.memory)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             local_storage, [bd.size for bd in discovered_machine.block_devices]
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             device_tags, [bd.tags for bd in discovered_machine.block_devices]
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             mac_addresses,
             [m.mac_address for m in discovered_machine.interfaces],
         )
@@ -2570,14 +2570,14 @@ class TestVirshPodDriver(MAASTestCase):
         mock.return_value = False
         driver = virsh.VirshPodDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["libvirt-clients"], missing)
+        self.assertEqual(["libvirt-clients"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = virsh.VirshPodDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def make_context(self):
         return {
diff --git a/src/provisioningserver/drivers/power/tests/test_amt.py b/src/provisioningserver/drivers/power/tests/test_amt.py
index c3776da..f97b3c5 100644
--- a/src/provisioningserver/drivers/power/tests/test_amt.py
+++ b/src/provisioningserver/drivers/power/tests/test_amt.py
@@ -103,14 +103,14 @@ class TestAMTPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = amt_module.AMTPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["wsmancli"], missing)
+        self.assertEqual(["wsmancli"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = amt_module.AMTPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_render_wsman_state_xml_renders_xml(self):
         amt_power_driver = AMTPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_apc.py b/src/provisioningserver/drivers/power/tests/test_apc.py
index 350931e..028e394 100644
--- a/src/provisioningserver/drivers/power/tests/test_apc.py
+++ b/src/provisioningserver/drivers/power/tests/test_apc.py
@@ -30,14 +30,14 @@ class TestAPCPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = apc_module.APCPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["snmp"], missing)
+        self.assertEqual(["snmp"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = apc_module.APCPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def patch_run_command(self, stdout="", stderr="", returncode=0):
         mock_run_command = self.patch(apc_module.shell, "run_command")
diff --git a/src/provisioningserver/drivers/power/tests/test_dli.py b/src/provisioningserver/drivers/power/tests/test_dli.py
index ff43388..7fbeb69 100644
--- a/src/provisioningserver/drivers/power/tests/test_dli.py
+++ b/src/provisioningserver/drivers/power/tests/test_dli.py
@@ -45,14 +45,14 @@ class TestDLIPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = dli_module.DLIPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["wget"], missing)
+        self.assertEqual(["wget"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = dli_module.DLIPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_set_outlet_state_calls_wget(self):
         driver = dli_module.DLIPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_eaton.py b/src/provisioningserver/drivers/power/tests/test_eaton.py
index 900bdc9..7e8ddb2 100644
--- a/src/provisioningserver/drivers/power/tests/test_eaton.py
+++ b/src/provisioningserver/drivers/power/tests/test_eaton.py
@@ -27,14 +27,14 @@ class TestEatonPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = eaton_module.EatonPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["snmp"], missing)
+        self.assertEqual(["snmp"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = eaton_module.EatonPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def patch_run_command(self, stdout="", stderr="", returncode=0):
         mock_run_command = self.patch(eaton_module.shell, "run_command")
diff --git a/src/provisioningserver/drivers/power/tests/test_hmc.py b/src/provisioningserver/drivers/power/tests/test_hmc.py
index 32d7149..117f3b2 100644
--- a/src/provisioningserver/drivers/power/tests/test_hmc.py
+++ b/src/provisioningserver/drivers/power/tests/test_hmc.py
@@ -42,7 +42,7 @@ class TestHMCPowerDriver(MAASTestCase):
         # there's nothing to check for, just confirm it returns []
         driver = hmc_module.HMCPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_run_hmc_command_returns_command_output(self):
         driver = HMCPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_ipmi.py b/src/provisioningserver/drivers/power/tests/test_ipmi.py
index 7f91d0e..25c9634 100644
--- a/src/provisioningserver/drivers/power/tests/test_ipmi.py
+++ b/src/provisioningserver/drivers/power/tests/test_ipmi.py
@@ -134,14 +134,14 @@ class TestIPMIPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = ipmi_module.IPMIPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["freeipmi-tools"], missing)
+        self.assertEqual(["freeipmi-tools"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = ipmi_module.IPMIPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_finds_power_address_from_mac_address(self):
         context = make_context()
diff --git a/src/provisioningserver/drivers/power/tests/test_manual.py b/src/provisioningserver/drivers/power/tests/test_manual.py
index 529c0d0..1fcf69c 100644
--- a/src/provisioningserver/drivers/power/tests/test_manual.py
+++ b/src/provisioningserver/drivers/power/tests/test_manual.py
@@ -13,7 +13,7 @@ class TestManualPowerDriver(MAASTestCase):
     def test_no_missing_packages(self):
         driver = manual_module.ManualPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_power_on(self):
         driver = manual_module.ManualPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_moonshot.py b/src/provisioningserver/drivers/power/tests/test_moonshot.py
index 05dc5d6..3f28eab 100644
--- a/src/provisioningserver/drivers/power/tests/test_moonshot.py
+++ b/src/provisioningserver/drivers/power/tests/test_moonshot.py
@@ -81,14 +81,14 @@ class TestMoonshotIPMIPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = moonshot_module.MoonshotIPMIPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["ipmitool"], missing)
+        self.assertEqual(["ipmitool"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = moonshot_module.MoonshotIPMIPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_issue_ipmitool_command_sets_pxe_boot(self):
         context = make_context()
diff --git a/src/provisioningserver/drivers/power/tests/test_mscm.py b/src/provisioningserver/drivers/power/tests/test_mscm.py
index a6e28c7..827f380 100644
--- a/src/provisioningserver/drivers/power/tests/test_mscm.py
+++ b/src/provisioningserver/drivers/power/tests/test_mscm.py
@@ -87,7 +87,7 @@ class TestMSCMPowerDriver(MAASTestCase):
         # there's nothing to check for, just confirm it returns []
         driver = mscm_module.MSCMPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_run_mscm_command_returns_command_output(self):
         driver = MSCMPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_msftocs.py b/src/provisioningserver/drivers/power/tests/test_msftocs.py
index 6500674..d0ee318 100644
--- a/src/provisioningserver/drivers/power/tests/test_msftocs.py
+++ b/src/provisioningserver/drivers/power/tests/test_msftocs.py
@@ -53,7 +53,7 @@ class TestMicrosoftOCSPowerDriver(MAASTestCase):
         # there's nothing to check for, just confirm it returns []
         driver = MicrosoftOCSPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_extract_from_response_finds_element_content(self):
         driver = MicrosoftOCSPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_nova.py b/src/provisioningserver/drivers/power/tests/test_nova.py
index 0a0ee97..4a5c19a 100644
--- a/src/provisioningserver/drivers/power/tests/test_nova.py
+++ b/src/provisioningserver/drivers/power/tests/test_nova.py
@@ -19,14 +19,14 @@ class TestNovaPowerDriver(MAASTestCase):
         mock = self.patch(driver, "try_novaapi_import")
         mock.return_value = False
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["python3-novaclient"], missing)
+        self.assertEqual(["python3-novaclient"], missing)
 
     def test_no_missing_packages(self):
         driver = nova_module.NovaPowerDriver()
         mock = self.patch(driver, "try_novaapi_import")
         mock.return_value = True
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def make_parameters(self):
         system_id = factory.make_name("system_id")
diff --git a/src/provisioningserver/drivers/power/tests/test_openbmc.py b/src/provisioningserver/drivers/power/tests/test_openbmc.py
index 8f68164..f480dd8 100644
--- a/src/provisioningserver/drivers/power/tests/test_openbmc.py
+++ b/src/provisioningserver/drivers/power/tests/test_openbmc.py
@@ -56,7 +56,7 @@ class TestOpenBMCPowerDriver(MAASTestCase):
     def test_missing_packages(self):
         driver = OpenBMCPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_get_url_with_ip(self):
         driver = OpenBMCPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_recs.py b/src/provisioningserver/drivers/power/tests/test_recs.py
index a2d1625..300dd28 100644
--- a/src/provisioningserver/drivers/power/tests/test_recs.py
+++ b/src/provisioningserver/drivers/power/tests/test_recs.py
@@ -45,7 +45,7 @@ class TestRECSPowerDriver(MAASTestCase):
         mock.return_value = True
         driver = RECSPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def make_context(self):
         ip = factory.make_name("power_address")
@@ -65,7 +65,7 @@ class TestRECSPowerDriver(MAASTestCase):
     def test_extract_recs_parameters_extracts_parameters(self):
         ip, port, username, password, node_id, context = self.make_context()
 
-        self.assertItemsEqual(
+        self.assertEqual(
             (ip, port, username, password, node_id),
             extract_recs_parameters(context),
         )
diff --git a/src/provisioningserver/drivers/power/tests/test_redfish.py b/src/provisioningserver/drivers/power/tests/test_redfish.py
index 22118eb..ee98c73 100644
--- a/src/provisioningserver/drivers/power/tests/test_redfish.py
+++ b/src/provisioningserver/drivers/power/tests/test_redfish.py
@@ -151,7 +151,7 @@ class TestRedfishPowerDriver(MAASTestCase):
         # there's nothing to check for, just confirm it returns []
         driver = RedfishPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_get_url_with_ip(self):
         driver = RedfishPowerDriver()
diff --git a/src/provisioningserver/drivers/power/tests/test_registry.py b/src/provisioningserver/drivers/power/tests/test_registry.py
index c268d3d..0ff87e3 100644
--- a/src/provisioningserver/drivers/power/tests/test_registry.py
+++ b/src/provisioningserver/drivers/power/tests/test_registry.py
@@ -22,7 +22,7 @@ class TestPowerDriverRegistry(MAASTestCase):
         self.useFixture(RegistryFixture())
 
     def test_registry(self):
-        self.assertItemsEqual([], PowerDriverRegistry)
+        self.assertEqual([], list(PowerDriverRegistry))
         PowerDriverRegistry.register_item("driver", sentinel.driver)
         self.assertIn(
             sentinel.driver, (item for name, item in PowerDriverRegistry)
@@ -41,7 +41,7 @@ class TestPowerDriverRegistry(MAASTestCase):
         PowerDriverRegistry.register_item(
             fake_pod_driver.name, fake_pod_driver
         )
-        self.assertItemsEqual(
+        self.assertEqual(
             [
                 {
                     "driver_type": "power",
diff --git a/src/provisioningserver/drivers/power/tests/test_seamicro.py b/src/provisioningserver/drivers/power/tests/test_seamicro.py
index e707cb7..77c7bc3 100644
--- a/src/provisioningserver/drivers/power/tests/test_seamicro.py
+++ b/src/provisioningserver/drivers/power/tests/test_seamicro.py
@@ -29,14 +29,14 @@ class TestSeaMicroPowerDriver(MAASTestCase):
         mock.return_value = False
         driver = seamicro_module.SeaMicroPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["ipmitool"], missing)
+        self.assertEqual(["ipmitool"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(has_command_available)
         mock.return_value = True
         driver = seamicro_module.SeaMicroPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def make_context(self):
         ip = factory.make_name("power_address")
@@ -56,7 +56,7 @@ class TestSeaMicroPowerDriver(MAASTestCase):
         power_control = choice(["ipmi", "restapi", "restapi2"])
         context["power_control"] = power_control
 
-        self.assertItemsEqual(
+        self.assertEqual(
             (ip, username, password, server_id, power_control),
             extract_seamicro_parameters(context),
         )
diff --git a/src/provisioningserver/drivers/power/tests/test_ucsm.py b/src/provisioningserver/drivers/power/tests/test_ucsm.py
index 0f1d783..e81ad16 100644
--- a/src/provisioningserver/drivers/power/tests/test_ucsm.py
+++ b/src/provisioningserver/drivers/power/tests/test_ucsm.py
@@ -21,7 +21,7 @@ class TestUCSMPowerDriver(MAASTestCase):
         # there's nothing to check for, just confirm it returns []
         driver = ucsm_module.UCSMPowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def make_parameters(self):
         system_id = factory.make_name("system_id")
@@ -48,7 +48,7 @@ class TestUCSMPowerDriver(MAASTestCase):
             context,
         ) = self.make_parameters()
 
-        self.assertItemsEqual(
+        self.assertEqual(
             (url, username, password, uuid), extract_ucsm_parameters(context)
         )
 
diff --git a/src/provisioningserver/drivers/power/tests/test_vmware.py b/src/provisioningserver/drivers/power/tests/test_vmware.py
index ef05990..a8a0ccf 100644
--- a/src/provisioningserver/drivers/power/tests/test_vmware.py
+++ b/src/provisioningserver/drivers/power/tests/test_vmware.py
@@ -23,14 +23,14 @@ class TestVMwarePowerDriver(MAASTestCase):
         mock.return_value = False
         driver = vmware_module.VMwarePowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual(["python3-pyvmomi"], missing)
+        self.assertEqual(["python3-pyvmomi"], missing)
 
     def test_no_missing_packages(self):
         mock = self.patch(try_pyvmomi_import)
         mock.return_value = True
         driver = vmware_module.VMwarePowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def make_parameters(self, has_optional=True):
         system_id = factory.make_name("system_id")
@@ -78,7 +78,7 @@ class TestVMwarePowerDriver(MAASTestCase):
             context,
         ) = self.make_parameters()
 
-        self.assertItemsEqual(
+        self.assertEqual(
             (host, username, password, vm_name, uuid, None, None),
             extract_vmware_parameters(context),
         )
@@ -96,7 +96,7 @@ class TestVMwarePowerDriver(MAASTestCase):
             context,
         ) = self.make_parameters(has_optional=False)
 
-        self.assertItemsEqual(
+        self.assertEqual(
             (host, username, password, vm_name, uuid, port, protocol),
             extract_vmware_parameters(context),
         )
diff --git a/src/provisioningserver/drivers/power/tests/test_webhook.py b/src/provisioningserver/drivers/power/tests/test_webhook.py
index 0ba2b43..ce974e1 100644
--- a/src/provisioningserver/drivers/power/tests/test_webhook.py
+++ b/src/provisioningserver/drivers/power/tests/test_webhook.py
@@ -252,7 +252,7 @@ class TestWebhookPowerDriver(MAASTestCase):
         self.assertThat(mock_readBody, MockNotCalled())
 
     def test_missing_packages(self):
-        self.assertItemsEqual([], self.webhook.detect_missing_packages())
+        self.assertEqual([], self.webhook.detect_missing_packages())
 
     def test_power_on(self):
         mock_webhook_request = self.patch(self.webhook, "_webhook_request")
diff --git a/src/provisioningserver/drivers/power/tests/test_wedge.py b/src/provisioningserver/drivers/power/tests/test_wedge.py
index 4c2412e..21b1263 100644
--- a/src/provisioningserver/drivers/power/tests/test_wedge.py
+++ b/src/provisioningserver/drivers/power/tests/test_wedge.py
@@ -40,7 +40,7 @@ class TestWedgePowerDriver(MAASTestCase):
         # there's nothing to check for, just confirm it returns []
         driver = wedge_module.WedgePowerDriver()
         missing = driver.detect_missing_packages()
-        self.assertItemsEqual([], missing)
+        self.assertEqual([], missing)
 
     def test_run_wedge_command_returns_command_output(self):
         driver = WedgePowerDriver()
diff --git a/src/provisioningserver/drivers/tests/test_base.py b/src/provisioningserver/drivers/tests/test_base.py
index 4dc703e..a7440e7 100644
--- a/src/provisioningserver/drivers/tests/test_base.py
+++ b/src/provisioningserver/drivers/tests/test_base.py
@@ -400,7 +400,7 @@ class TestRegistries(MAASTestCase):
         self.useFixture(RegistryFixture())
 
     def test_architecture_registry(self):
-        self.assertItemsEqual([], ArchitectureRegistry)
+        self.assertEqual([], list(ArchitectureRegistry))
         ArchitectureRegistry.register_item("resource", sentinel.resource)
         self.assertIn(
             sentinel.resource, (item for name, item in ArchitectureRegistry)
diff --git a/src/provisioningserver/import_images/tests/test_boot_image_mapping.py b/src/provisioningserver/import_images/tests/test_boot_image_mapping.py
index de0938c..cd4ec66 100644
--- a/src/provisioningserver/import_images/tests/test_boot_image_mapping.py
+++ b/src/provisioningserver/import_images/tests/test_boot_image_mapping.py
@@ -24,13 +24,13 @@ class TestBootImageMapping(MAASTestCase):
     """Tests for `BootImageMapping`."""
 
     def test_initially_empty(self):
-        self.assertItemsEqual([], BootImageMapping().items())
+        self.assertCountEqual([], BootImageMapping().items())
 
     def test_items_returns_items(self):
         image = make_image_spec()
         resource = factory.make_name("resource")
         image_dict = set_resource(image_spec=image, resource=resource)
-        self.assertItemsEqual([(image, resource)], image_dict.items())
+        self.assertCountEqual([(image, resource)], image_dict.items())
 
     def test_is_empty_returns_True_if_empty(self):
         self.assertTrue(BootImageMapping().is_empty())
@@ -45,14 +45,14 @@ class TestBootImageMapping(MAASTestCase):
         image = make_image_spec()
         resource = factory.make_name("resource")
         image_dict.setdefault(image, resource)
-        self.assertItemsEqual([(image, resource)], image_dict.items())
+        self.assertCountEqual([(image, resource)], image_dict.items())
 
     def test_setdefault_leaves_set_item_unchanged(self):
         image = make_image_spec()
         old_resource = factory.make_name("resource")
         image_dict = set_resource(image_spec=image, resource=old_resource)
         image_dict.setdefault(image, factory.make_name("newresource"))
-        self.assertItemsEqual([(image, old_resource)], image_dict.items())
+        self.assertCountEqual([(image, old_resource)], image_dict.items())
 
     def test_set_overwrites_item(self):
         image_dict = BootImageMapping()
@@ -60,7 +60,7 @@ class TestBootImageMapping(MAASTestCase):
         resource = factory.make_name("resource")
         image_dict.setdefault(image, factory.make_name("resource"))
         image_dict.set(image, resource)
-        self.assertItemsEqual([(image, resource)], image_dict.items())
+        self.assertCountEqual([(image, resource)], image_dict.items())
 
     def test_dump_json_is_consistent(self):
         image = make_image_spec()
diff --git a/src/provisioningserver/import_images/tests/test_boot_resources.py b/src/provisioningserver/import_images/tests/test_boot_resources.py
index 05e088e..b1e7c02 100644
--- a/src/provisioningserver/import_images/tests/test_boot_resources.py
+++ b/src/provisioningserver/import_images/tests/test_boot_resources.py
@@ -407,14 +407,14 @@ class TestMain(MAASTestCase):
         self.assertEqual(
             [label], list(meta_data[osystem][arch][subarch][kflavor][release])
         )
-        self.assertItemsEqual(
+        self.assertEqual(
             [
                 "content_id",
                 "kflavor",
                 "path",
                 "product_name",
-                "version_name",
                 "subarches",
+                "version_name",
             ],
             list(meta_data[osystem][arch][subarch][kflavor][release][label]),
         )
diff --git a/src/provisioningserver/import_images/tests/test_cleanup.py b/src/provisioningserver/import_images/tests/test_cleanup.py
index b95e6f0..b55101a 100644
--- a/src/provisioningserver/import_images/tests/test_cleanup.py
+++ b/src/provisioningserver/import_images/tests/test_cleanup.py
@@ -41,14 +41,14 @@ class TestCleanup(MAASTestCase):
     def test_list_old_snapshots_returns_all(self):
         storage = self.make_dir()
         snapshots = [self.make_snapshot_dir(storage) for _ in range(3)]
-        self.assertItemsEqual(snapshots, cleanup.list_old_snapshots(storage))
+        self.assertCountEqual(snapshots, cleanup.list_old_snapshots(storage))
 
     def test_list_old_snapshots_returns_all_but_current_directory(self):
         storage = self.make_dir()
         snapshots = [self.make_snapshot_dir(storage) for _ in range(3)]
         current_snapshot = self.make_snapshot_dir(storage)
         os.symlink(current_snapshot, os.path.join(storage, "current"))
-        self.assertItemsEqual(snapshots, cleanup.list_old_snapshots(storage))
+        self.assertCountEqual(snapshots, cleanup.list_old_snapshots(storage))
 
     def test_cleanup_snapshots_removes_all_old_snapshots(self):
         storage = self.make_dir()
@@ -63,14 +63,14 @@ class TestCleanup(MAASTestCase):
 
     def test_list_unused_cache_files_returns_empty(self):
         storage = self.make_dir()
-        self.assertItemsEqual([], cleanup.list_unused_cache_files(storage))
+        self.assertEqual([], cleanup.list_unused_cache_files(storage))
 
     def test_list_unused_cache_files_returns_all_files_nlink_equal_one(self):
         storage = self.make_dir()
         cache_nlink_1 = [self.make_cache_file(storage) for _ in range(3)]
         for _ in range(3):
             self.make_cache_file(storage, link_count=randint(1, 3))
-        self.assertItemsEqual(
+        self.assertCountEqual(
             cache_nlink_1, cleanup.list_unused_cache_files(storage)
         )
 
@@ -89,7 +89,7 @@ class TestCleanup(MAASTestCase):
             for filename in os.listdir(cache_dir)
             if os.path.isfile(os.path.join(cache_dir, filename))
         ]
-        self.assertItemsEqual(cache_nlink_greater_than_1, remaining_cache)
+        self.assertCountEqual(cache_nlink_greater_than_1, remaining_cache)
 
     def test_cleanup_snapshots_and_cache_calls(self):
         storage = self.make_dir()
diff --git a/src/provisioningserver/import_images/tests/test_download_descriptions.py b/src/provisioningserver/import_images/tests/test_download_descriptions.py
index a9cc142..564e546 100644
--- a/src/provisioningserver/import_images/tests/test_download_descriptions.py
+++ b/src/provisioningserver/import_images/tests/test_download_descriptions.py
@@ -457,7 +457,7 @@ class TestRepoDumper(MAASTestCase):
             ),
             sentinel.contentsource,
         )
-        image_specs = [
+        image_specs = {
             make_image_spec(
                 os=item["os"],
                 release=item["release"],
@@ -466,8 +466,8 @@ class TestRepoDumper(MAASTestCase):
                 label=item["label"],
             )
             for subarch in subarches
-        ]
-        self.assertItemsEqual(image_specs, list(boot_images_dict.mapping))
+        }
+        self.assertEqual(image_specs, boot_images_dict.mapping.keys())
 
     def test_insert_item_sets_compat_item_specific_to_subarch(self):
         boot_images_dict = BootImageMapping()
@@ -624,7 +624,7 @@ class TestRepoDumper(MAASTestCase):
             ),
             sentinel.contentsource,
         )
-        image_specs = [
+        image_specs = {
             make_image_spec(
                 os=item["os"],
                 release="uefi",
@@ -634,8 +634,8 @@ class TestRepoDumper(MAASTestCase):
                 label=item["label"],
             )
             for subarch in item["subarches"].split(",")
-        ]
-        self.assertItemsEqual(image_specs, list(boot_images_dict.mapping))
+        }
+        self.assertEqual(image_specs, boot_images_dict.mapping.keys())
 
     def test_insert_item_validates(self):
         boot_images_dict = BootImageMapping()
@@ -654,7 +654,7 @@ class TestRepoDumper(MAASTestCase):
             ),
             sentinel.contentsource,
         )
-        self.assertItemsEqual([], list(boot_images_dict.mapping))
+        self.assertEqual(set(), boot_images_dict.mapping.keys())
 
     def test_insert_item_doesnt_validate_when_instructed(self):
         boot_images_dict = BootImageMapping()
@@ -673,7 +673,7 @@ class TestRepoDumper(MAASTestCase):
             ),
             sentinel.contentsource,
         )
-        image_specs = [
+        image_specs = {
             make_image_spec(
                 os=item["os"],
                 release=item["release"],
@@ -682,8 +682,8 @@ class TestRepoDumper(MAASTestCase):
                 label=item["label"],
             )
             for subarch in item["subarches"].split(",")
-        ]
-        self.assertItemsEqual(image_specs, list(boot_images_dict.mapping))
+        }
+        self.assertEqual(image_specs, boot_images_dict.mapping.keys())
 
     def test_sync_does_propagate_ioerror(self):
         io_error = factory.make_exception_type(bases=(IOError,))
diff --git a/src/provisioningserver/import_images/tests/test_product_mapping.py b/src/provisioningserver/import_images/tests/test_product_mapping.py
index 979b9f3..2a3eede 100644
--- a/src/provisioningserver/import_images/tests/test_product_mapping.py
+++ b/src/provisioningserver/import_images/tests/test_product_mapping.py
@@ -162,6 +162,6 @@ class TestMapProducts(MAASTestCase):
             resource["version_name"],
         )
         self.assertEqual([key], list(products_mapping.mapping))
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [image1.subarch, image2.subarch], products_mapping.get(resource)
         )
diff --git a/src/provisioningserver/rackdservices/tests/test_tftp.py b/src/provisioningserver/rackdservices/tests/test_tftp.py
index bd170f9..dda5c23 100644
--- a/src/provisioningserver/rackdservices/tests/test_tftp.py
+++ b/src/provisioningserver/rackdservices/tests/test_tftp.py
@@ -921,7 +921,7 @@ class TestTFTPService(MAASTestCase):
         )
         self.assertThat(tftp_service.getServers(), AllMatch(expected_server))
         # Only the interface used for each service differs.
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [svc.kwargs for svc in tftp_service.getServers()],
             [{"interface": interface} for interface in interfaces],
         )
diff --git a/src/provisioningserver/tests/test_config.py b/src/provisioningserver/tests/test_config.py
index 5995cd2..3c895d3 100644
--- a/src/provisioningserver/tests/test_config.py
+++ b/src/provisioningserver/tests/test_config.py
@@ -446,7 +446,7 @@ class TestConfigurationFile(MAASTestCase):
             pass  # Write nothing to the file.
         config = ConfigurationFile(config_file)
         config.load()
-        self.assertItemsEqual(set(config), set())
+        self.assertEqual(set(config), set())
 
     def test_load_file_with_non_mapping_crashes(self):
         config_file = os.path.join(self.make_dir(), "config")
diff --git a/src/provisioningserver/tests/test_events.py b/src/provisioningserver/tests/test_events.py
index 4c614a0..6dea374 100644
--- a/src/provisioningserver/tests/test_events.py
+++ b/src/provisioningserver/tests/test_events.py
@@ -39,7 +39,7 @@ from provisioningserver.utils.testing import MAASIDFixture
 class TestEvents(MAASTestCase):
     def test_every_event_has_details(self):
         all_events = map_enum(EVENT_TYPES)
-        self.assertItemsEqual(all_events.values(), EVENT_DETAILS.keys())
+        self.assertEqual(set(all_events.values()), EVENT_DETAILS.keys())
         self.assertThat(
             EVENT_DETAILS.values(), AllMatch(IsInstance(EventDetail))
         )
diff --git a/src/provisioningserver/tests/test_service_monitor.py b/src/provisioningserver/tests/test_service_monitor.py
index e2deee2..8147d5b 100644
--- a/src/provisioningserver/tests/test_service_monitor.py
+++ b/src/provisioningserver/tests/test_service_monitor.py
@@ -68,8 +68,8 @@ class TestSyslogServiceOnRack(MAASTestCase):
 
 class TestGlobalServiceMonitor(MAASTestCase):
     def test_includes_all_services(self):
-        self.assertItemsEqual(
-            [
+        self.assertEqual(
+            {
                 "http",
                 "dhcpd",
                 "dhcpd6",
@@ -77,6 +77,6 @@ class TestGlobalServiceMonitor(MAASTestCase):
                 "ntp_rack",
                 "proxy_rack",
                 "syslog_rack",
-            ],
+            },
             service_monitor._services.keys(),
         )
diff --git a/src/provisioningserver/tests/test_tags.py b/src/provisioningserver/tests/test_tags.py
index 9db756f..4c6f7ec 100644
--- a/src/provisioningserver/tests/test_tags.py
+++ b/src/provisioningserver/tests/test_tags.py
@@ -484,7 +484,7 @@ class TestGenNodeDetails(MAASTestCase):
         get_details_for_nodes.side_effect = lambda *args: responses.pop(0)
         self.fake_merge_details()
         node_details = tags.gen_node_details(sentinel.client, batches)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [("s1", "merged:foo"), ("s2", "merged:bar"), ("s3", "merged:cob")],
             node_details,
         )
diff --git a/src/provisioningserver/tests/test_upgrade_cluster.py b/src/provisioningserver/tests/test_upgrade_cluster.py
index 03e0d76..e70ea46 100644
--- a/src/provisioningserver/tests/test_upgrade_cluster.py
+++ b/src/provisioningserver/tests/test_upgrade_cluster.py
@@ -299,7 +299,7 @@ class TestMigrateArchitecturesIntoUbuntuDirectory(MAASTestCase):
         upgrade_cluster.migrate_architectures_into_ubuntu_directory(
             self.current_dir
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arches,
             list_subdirs(os.path.join(storage_dir, "current", "ubuntu")),
         )
@@ -330,7 +330,7 @@ class TestMigrateArchitecturesIntoUbuntuDirectory(MAASTestCase):
         upgrade_cluster.migrate_architectures_into_ubuntu_directory(
             self.current_dir
         )
-        self.assertItemsEqual(
+        self.assertEqual(
             [move_arch],
             list_subdirs(os.path.join(storage_dir, "current", "ubuntu")),
         )
@@ -373,7 +373,7 @@ class TestMigrateArchitecturesIntoUbuntuDirectory(MAASTestCase):
         upgrade_cluster.migrate_architectures_into_ubuntu_directory(
             self.current_dir
         )
-        self.assertItemsEqual(
+        self.assertEqual(
             [move_arch],
             list_subdirs(os.path.join(storage_dir, "current", "ubuntu")),
         )
diff --git a/src/provisioningserver/utils/tests/test_arp.py b/src/provisioningserver/utils/tests/test_arp.py
index 6565fd3..9747819 100644
--- a/src/provisioningserver/utils/tests/test_arp.py
+++ b/src/provisioningserver/utils/tests/test_arp.py
@@ -214,7 +214,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REQUEST,
             )
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arp.bindings(), [(IPAddress(pkt_sender_ip), EUI(pkt_sender_mac))]
         )
 
@@ -232,7 +232,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REPLY,
             )
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arp.bindings(),
             [
                 (IPAddress(pkt_sender_ip), EUI(pkt_sender_mac)),
@@ -254,7 +254,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REQUEST,
             )
         )
-        self.assertItemsEqual(arp.bindings(), [])
+        self.assertCountEqual(arp.bindings(), [])
 
     def test_bindings__skips_null_source_ip_in_reply(self):
         pkt_sender_mac = "01:02:03:04:05:06"
@@ -270,7 +270,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REPLY,
             )
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arp.bindings(), [(IPAddress(pkt_target_ip), EUI(pkt_target_mac))]
         )
 
@@ -288,7 +288,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REPLY,
             )
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arp.bindings(), [(IPAddress(pkt_sender_ip), EUI(pkt_sender_mac))]
         )
 
@@ -306,7 +306,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REQUEST,
             )
         )
-        self.assertItemsEqual(arp.bindings(), [])
+        self.assertCountEqual(arp.bindings(), [])
 
     def test_bindings__skips_null_source_eui_in_reply(self):
         pkt_sender_mac = "00:00:00:00:00:00"
@@ -322,7 +322,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REPLY,
             )
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arp.bindings(), [(IPAddress(pkt_target_ip), EUI(pkt_target_mac))]
         )
 
@@ -340,7 +340,7 @@ class TestARP(MAASTestCase):
                 op=ARP_OPERATION.REPLY,
             )
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             arp.bindings(), [(IPAddress(pkt_sender_ip), EUI(pkt_sender_mac))]
         )
 
diff --git a/src/provisioningserver/utils/tests/test_enum.py b/src/provisioningserver/utils/tests/test_enum.py
index c74dd92..99b4a6a 100644
--- a/src/provisioningserver/utils/tests/test_enum.py
+++ b/src/provisioningserver/utils/tests/test_enum.py
@@ -14,7 +14,7 @@ class TestEnum(MAASTestCase):
             ONE = 1
             TWO = 2
 
-        self.assertItemsEqual(["ONE", "TWO"], map_enum(Enum).keys())
+        self.assertEqual({"ONE", "TWO"}, map_enum(Enum).keys())
 
     def test_map_enum_omits_private_or_special_methods(self):
         class Enum:
@@ -29,7 +29,7 @@ class TestEnum(MAASTestCase):
 
             VALUE = 9
 
-        self.assertItemsEqual(["VALUE"], map_enum(Enum).keys())
+        self.assertEqual({"VALUE"}, map_enum(Enum).keys())
 
     def test_map_enum_maps_values(self):
         class Enum:
diff --git a/src/provisioningserver/utils/tests/test_events.py b/src/provisioningserver/utils/tests/test_events.py
index 59e85bc..c9a677f 100644
--- a/src/provisioningserver/utils/tests/test_events.py
+++ b/src/provisioningserver/utils/tests/test_events.py
@@ -9,7 +9,6 @@ from unittest.mock import MagicMock, sentinel
 from testtools.matchers import IsInstance
 
 from maastesting.factory import factory
-from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import MAASTestCase
 from provisioningserver.utils.events import Event, EventGroup
 
@@ -20,27 +19,27 @@ class TestEvent(MAASTestCase):
     def test_registerHandler(self):
         event = Event()
         event.registerHandler(sentinel.handler)
-        self.assertItemsEqual([sentinel.handler], event.handlers)
+        self.assertEqual({sentinel.handler}, event.handlers)
 
     def test_registerHandler_during_fire(self):
         event = Event()
         event.registerHandler(event.registerHandler)
         event.fire(sentinel.otherHandler)
-        self.assertItemsEqual(
-            [event.registerHandler, sentinel.otherHandler], event.handlers
+        self.assertEqual(
+            {event.registerHandler, sentinel.otherHandler}, event.handlers
         )
 
     def test_unregisterHandler(self):
         event = Event()
         event.registerHandler(sentinel.handler)
         event.unregisterHandler(sentinel.handler)
-        self.assertItemsEqual([], event.handlers)
+        self.assertEqual(set(), event.handlers)
 
     def test_unregisterHandler_during_fire(self):
         event = Event()
         event.registerHandler(event.unregisterHandler)
         event.fire(event.unregisterHandler)
-        self.assertItemsEqual([], event.handlers)
+        self.assertEqual(set(), event.handlers)
 
     def test_fire_calls_all_handlers(self):
         event = Event()
@@ -54,8 +53,8 @@ class TestEvent(MAASTestCase):
             for _ in range(3)
         }
         event.fire(*args, **kwargs)
-        self.assertThat(handler_one, MockCalledOnceWith(*args, **kwargs))
-        self.assertThat(handler_two, MockCalledOnceWith(*args, **kwargs))
+        handler_one.mock_called_once_with(*args, **kwargs)
+        handler_two.mock_called_once_with(*args, **kwargs)
 
 
 class TestEventGroup(MAASTestCase):
diff --git a/src/provisioningserver/utils/tests/test_ipaddr.py b/src/provisioningserver/utils/tests/test_ipaddr.py
index 02663c9..adf6c59 100644
--- a/src/provisioningserver/utils/tests/test_ipaddr.py
+++ b/src/provisioningserver/utils/tests/test_ipaddr.py
@@ -162,7 +162,7 @@ class TestGetIPAddr(MAASTestCase):
         patch_get_ip_addr = self.patch(ipaddr_module, "get_ip_addr")
         patch_get_ip_addr.return_value = results
         observed = get_mac_addresses()
-        self.assertItemsEqual(mac_addresses, observed)
+        self.assertCountEqual(mac_addresses, observed)
 
     def test_get_mac_addresses_ignores_duplicates(self):
         mac_addresses = set()
@@ -174,7 +174,7 @@ class TestGetIPAddr(MAASTestCase):
         patch_get_ip_addr = self.patch(ipaddr_module, "get_ip_addr")
         patch_get_ip_addr.return_value = results
         observed = get_mac_addresses()
-        self.assertItemsEqual(mac_addresses, observed)
+        self.assertCountEqual(mac_addresses, observed)
 
 
 class TestUpdateInterfaceType(FakeSysProcTestCase):
diff --git a/src/provisioningserver/utils/tests/test_network.py b/src/provisioningserver/utils/tests/test_network.py
index dfe067d..9dccf19 100644
--- a/src/provisioningserver/utils/tests/test_network.py
+++ b/src/provisioningserver/utils/tests/test_network.py
@@ -519,7 +519,7 @@ class TestGetAllInterfaceAddresses(MAASTestCase):
             for ipv4, ipv6 in ips
         }
         patch_interfaces(self, interfaces)
-        self.assertItemsEqual(v4_ips + v6_ips, get_all_interface_addresses())
+        self.assertCountEqual(v4_ips + v6_ips, get_all_interface_addresses())
 
 
 class TestGetAllInterfaceAddressesWithMultipleClasses(MAASTestCase):
@@ -1958,7 +1958,7 @@ class TestInterfaceChildren(MAASTestCase):
         eth0_children = list(
             interface_children("eth0", interfaces, children_map)
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             eth0_children,
             [
                 ("eth0.100", {"parents": ["eth0"]}),
@@ -1968,7 +1968,7 @@ class TestInterfaceChildren(MAASTestCase):
         eth1_children = list(
             interface_children("eth1", interfaces, children_map)
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             eth1_children,
             [
                 ("eth1.100", {"parents": ["eth1"]}),
@@ -1997,7 +1997,7 @@ class TestGetDefaultMonitoredInterfaces(MAASTestCase):
             "eth0": {"parents": [], "type": "physical", "enabled": False},
             "eth1": {"parents": [], "type": "physical", "enabled": True},
         }
-        self.assertItemsEqual(
+        self.assertEqual(
             get_default_monitored_interfaces(interfaces), ["eth1"]
         )
 
@@ -2018,7 +2018,7 @@ class TestGetDefaultMonitoredInterfaces(MAASTestCase):
                 "enabled": False,
             },
         }
-        self.assertItemsEqual(
+        self.assertEqual(
             get_default_monitored_interfaces(interfaces), ["bond0"]
         )
 
@@ -2029,7 +2029,7 @@ class TestGetDefaultMonitoredInterfaces(MAASTestCase):
             "br0": {"parents": ["eth0"], "type": "bridge", "enabled": True},
             "virbr0": {"parents": [], "type": "bridge", "enabled": True},
         }
-        self.assertItemsEqual(
+        self.assertEqual(
             get_default_monitored_interfaces(interfaces),
             ["eth0", "eth1", "virbr0"],
         )
@@ -2039,7 +2039,7 @@ class TestGetDefaultMonitoredInterfaces(MAASTestCase):
             "eth0": {"parents": [], "type": "physical", "enabled": True},
             "eth0.100": {"parents": ["eth0"], "type": "vlan", "enabled": True},
         }
-        self.assertItemsEqual(
+        self.assertEqual(
             get_default_monitored_interfaces(interfaces), ["eth0"]
         )
 
diff --git a/src/provisioningserver/utils/tests/test_ps.py b/src/provisioningserver/utils/tests/test_ps.py
index ca2bbad..11e873e 100644
--- a/src/provisioningserver/utils/tests/test_ps.py
+++ b/src/provisioningserver/utils/tests/test_ps.py
@@ -141,7 +141,7 @@ class TestGetRunningPIDsWithCommand(MAASTestCase):
         proc_path = self.make_dir()
         self.make_init_process(proc_path)
         command = factory.make_name("command")
-        pids_running_command = set(random.randint(2, 999) for _ in range(3))
+        pids_running_command = [random.randint(2, 999) for _ in range(3)]
         for pid in pids_running_command:
             self.make_process(proc_path, pid, command=command)
         pids_not_running_command = set(
@@ -162,7 +162,7 @@ class TestGetRunningPIDsWithCommand(MAASTestCase):
             ps_module, "running_in_container"
         )
         mock_running_in_container.return_value = False
-        self.assertItemsEqual(
+        self.assertCountEqual(
             pids_running_command,
             get_running_pids_with_command(command, proc_path=proc_path),
         )
@@ -171,12 +171,12 @@ class TestGetRunningPIDsWithCommand(MAASTestCase):
         proc_path = self.make_dir()
         self.make_init_process(proc_path)
         command = factory.make_name("command")
-        pids_running_command = set(random.randint(2, 999) for _ in range(3))
+        pids_running_command = [random.randint(2, 999) for _ in range(3)]
         for pid in pids_running_command:
             self.make_process(proc_path, pid, command=command)
             # Remove the comm file to test the exception handling.
             os.remove(os.path.join(proc_path, str(pid), "comm"))
-        self.assertItemsEqual(
+        self.assertEqual(
             [], get_running_pids_with_command(command, proc_path=proc_path)
         )
 
@@ -184,7 +184,7 @@ class TestGetRunningPIDsWithCommand(MAASTestCase):
         proc_path = self.make_dir()
         self.make_init_process(proc_path, in_container=True)
         command = factory.make_name("command")
-        pids_running_command = set(random.randint(2, 999) for _ in range(3))
+        pids_running_command = [random.randint(2, 999) for _ in range(3)]
         for pid in pids_running_command:
             self.make_process(
                 proc_path, pid, in_container=True, command=command
@@ -203,7 +203,7 @@ class TestGetRunningPIDsWithCommand(MAASTestCase):
             ps_module, "running_in_container"
         )
         mock_running_in_container.return_value = True
-        self.assertItemsEqual(
+        self.assertCountEqual(
             pids_running_command,
             get_running_pids_with_command(command, proc_path=proc_path),
         )
diff --git a/src/provisioningserver/utils/tests/test_registry.py b/src/provisioningserver/utils/tests/test_registry.py
index c13a758..c56455f 100644
--- a/src/provisioningserver/utils/tests/test_registry.py
+++ b/src/provisioningserver/utils/tests/test_registry.py
@@ -35,12 +35,12 @@ class TestRegistry(MAASTestCase):
         from provisioningserver.drivers import Registry as Registry2
 
         Registry2.register_item("resource2", sentinel.resource2)
-        self.assertItemsEqual(
+        self.assertEqual(
             [
                 ("resource1", sentinel.resource1),
                 ("resource2", sentinel.resource2),
             ],
-            Registry2,
+            list(Registry2),
         )
 
     def test_getitem__(self):
diff --git a/src/provisioningserver/utils/tests/test_utils.py b/src/provisioningserver/utils/tests/test_utils.py
index c4cbeca..1a0cefe 100644
--- a/src/provisioningserver/utils/tests/test_utils.py
+++ b/src/provisioningserver/utils/tests/test_utils.py
@@ -154,36 +154,39 @@ class TestFlatten(MAASTestCase):
         self.assertThat(flatten(()), IsInstance(Iterator))
 
     def test_returns_empty_when_nothing_provided(self):
-        self.assertItemsEqual([], flatten([]))
-        self.assertItemsEqual([], flatten(()))
-        self.assertItemsEqual([], flatten({}))
-        self.assertItemsEqual([], flatten(set()))
-        self.assertItemsEqual([], flatten(([], (), {}, set())))
-        self.assertItemsEqual([], flatten(([[]], ((),))))
+        self.assertEqual([], list(flatten([])))
+        self.assertEqual([], list(flatten(())))
+        self.assertEqual([], list(flatten({})))
+        self.assertEqual([], list(flatten(set())))
+        self.assertEqual([], list(flatten(([], (), {}, set()))))
+        self.assertEqual([], list(flatten(([[]], ((),)))))
 
     def test_flattens_list(self):
-        self.assertItemsEqual([1, 2, 3, "abc"], flatten([1, 2, 3, "abc"]))
+        self.assertEqual([1, 2, 3, "abc"], list(flatten([1, 2, 3, "abc"])))
 
     def test_flattens_nested_lists(self):
-        self.assertItemsEqual([1, 2, 3, "abc"], flatten([[[1, 2, 3, "abc"]]]))
+        self.assertEqual([1, 2, 3, "abc"], list(flatten([[[1, 2, 3, "abc"]]])))
 
     def test_flattens_arbitrarily_nested_lists(self):
-        self.assertItemsEqual(
+        self.assertEqual(
             [1, "two", "three", 4, 5, 6],
-            flatten([[1], ["two", "three"], [4], [5, 6]]),
+            list(flatten([[1], ["two", "three"], [4], [5, 6]])),
         )
 
     def test_flattens_other_iterables(self):
-        self.assertItemsEqual(
-            [1, 2, 3.3, 4, 5, 6], flatten([1, 2, {3.3, 4, (5, 6)}])
+        self.assertEqual(
+            [1, 2, 3.3, 4, 5, 6], list(flatten([1, 2, {3.3, 4, (5, 6)}]))
         )
 
     def test_treats_string_like_objects_as_leaves(self):
         # Strings are iterable, but we know they cannot be flattened further.
-        self.assertItemsEqual(["abcdef"], flatten("abcdef"))
+        self.assertEqual(["abcdef"], list(flatten("abcdef")))
 
     def test_takes_star_args(self):
-        self.assertItemsEqual("abcdef", flatten("a", "b", "c", "d", "e", "f"))
+        self.assertEqual(
+            ["a", "b", "c", "d", "e", "f"],
+            list(flatten("a", "b", "c", "d", "e", "f")),
+        )
 
 
 class TestSudo(MAASTestCase):