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

[Adam Collard]

[metadataserver] Replace defunct assertItemsEqual

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b no-assertItemsEqual-metadataserver lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10988/consoleText

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 7642cd4d47e5d797e9be5e59e5bf35cbd957fab2

review: Approve

diff --git a/src/metadataserver/builtin_scripts/testing_scripts/tests/test_smartctl.py b/src/metadataserver/builtin_scripts/testing_scripts/tests/test_smartctl.py
index ba4449f..6443111 100644
--- a/src/metadataserver/builtin_scripts/testing_scripts/tests/test_smartctl.py
+++ b/src/metadataserver/builtin_scripts/testing_scripts/tests/test_smartctl.py
@@ -233,7 +233,7 @@ class TestDetectMegaRAIDConfig(MAASTestCase):
             ]
         )
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             scsi_bus_nums,
             smartctl.detect_megaraid_config(factory.make_name("blockdevice")),
         )
@@ -274,8 +274,8 @@ class TestCheckSMARTSupport(MAASTestCase):
             "Product: %s\n"
             "SMART support is: Available\n" % factory.make_name("product")
         )
-        self.assertItemsEqual(
-            [None, []],
+        self.assertEqual(
+            (None, []),
             smartctl.check_SMART_support(factory.make_name("blockdevice")),
         )
 
@@ -284,8 +284,8 @@ class TestCheckSMARTSupport(MAASTestCase):
         mock_run_smartctl.return_value = (
             "SMART overall-health self-assessment test result: "
         )
-        self.assertItemsEqual(
-            [None, []],
+        self.assertEqual(
+            (None, []),
             smartctl.check_SMART_support(factory.make_name("blockdevice")),
         )
 
@@ -296,8 +296,8 @@ class TestCheckSMARTSupport(MAASTestCase):
         )
         scsi_ids = [random.randint(0, 127) for _ in range(3)]
         self.patch(smartctl, "detect_megaraid_config").return_value = scsi_ids
-        self.assertItemsEqual(
-            ["megaraid", scsi_ids],
+        self.assertEqual(
+            ("megaraid", scsi_ids),
             smartctl.check_SMART_support(factory.make_name("blockdevice")),
         )
 
diff --git a/src/metadataserver/builtin_scripts/tests/test_hooks.py b/src/metadataserver/builtin_scripts/tests/test_hooks.py
index 00b2d42..9002856 100644
--- a/src/metadataserver/builtin_scripts/tests/test_hooks.py
+++ b/src/metadataserver/builtin_scripts/tests/test_hooks.py
@@ -1458,7 +1458,7 @@ class TestProcessLXDResults(MAASServerTestCase):
         process_lxd_results(node, make_lxd_output_json(), 0)
         self.assertThat(mock_set_initial_net_config, MockNotCalled())
         # Verify network device information was collected
-        self.assertItemsEqual(
+        self.assertEqual(
             ["Intel Corporation", "Intel Corporation", "Intel Corporation"],
             [iface.vendor for iface in node.interface_set.all()],
         )
@@ -1630,7 +1630,7 @@ class TestProcessLXDResults(MAASServerTestCase):
         process_lxd_results(node, json.dumps(data).encode(), 0)
 
         self.assertEqual(32158, node.memory)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [32158, 0], [numa.memory for numa in node.numanode_set.all()]
         )
 
@@ -2276,7 +2276,7 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
         for index, device in enumerate(devices):
             created_names.append(device.name)
             self.assertEqual(device.numa_node, numa_nodes[index])
-        self.assertItemsEqual(device_names, created_names)
+        self.assertCountEqual(device_names, created_names)
 
     def test_does_nothing_if_skip_storage(self):
         node = factory.make_Node(skip_storage=True)
@@ -2303,7 +2303,7 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
             device.name
             for device in PhysicalBlockDevice.objects.filter(node=node)
         ]
-        self.assertItemsEqual(device_names, created_names)
+        self.assertCountEqual(device_names, created_names)
 
     def test_skips_read_only_and_cdroms(self):
         node = factory.make_Node()
@@ -2317,7 +2317,7 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
             device.name
             for device in PhysicalBlockDevice.objects.filter(node=node)
         ]
-        self.assertItemsEqual([], created_names)
+        self.assertCountEqual([], created_names)
 
     def test_handles_renamed_block_device(self):
         node = factory.make_Node()
@@ -2335,7 +2335,7 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
             device.name
             for device in PhysicalBlockDevice.objects.filter(node=node)
         ]
-        self.assertItemsEqual(device_names, created_names)
+        self.assertCountEqual(device_names, created_names)
 
     def test_handles_new_block_device_in_front(self):
         # First simulate a node being commissioned with two disks. For
@@ -2378,7 +2378,7 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
             (device.name, device.serial)
             for device in PhysicalBlockDevice.objects.filter(node=node)
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 ("sdx", NEW_NAMES["storage"]["disks"][0]["serial"]),
                 ("sdy", NEW_NAMES["storage"]["disks"][1]["serial"]),
@@ -2403,7 +2403,7 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
             device.id
             for device in PhysicalBlockDevice.objects.filter(node=node)
         ]
-        self.assertItemsEqual(created_ids_two, created_ids_one)
+        self.assertCountEqual(created_ids_two, created_ids_one)
 
     def test_doesnt_reset_boot_disk(self):
         node = factory.make_Node()
@@ -3257,8 +3257,7 @@ class TestUpdateNodeNetworkInformation(MAASServerTestCase):
         self.assert_expected_interfaces_and_macs_exist_for_node(node2)
 
         # Ensure the MAC object moved over to node2.
-        self.assertItemsEqual([], Interface.objects.filter(node=node1))
-        self.assertItemsEqual([], Interface.objects.filter(node=node1))
+        self.assertCountEqual([], Interface.objects.filter(node=node1))
 
     def test_reassign_interfaces(self):
         """Test whether we can assign interfaces previously connected to a
@@ -3284,11 +3283,10 @@ class TestUpdateNodeNetworkInformation(MAASServerTestCase):
         self.assert_expected_interfaces_and_macs_exist_for_node(node2)
 
         # Now make sure all the objects moved to the second node.
-        self.assertItemsEqual([], Interface.objects.filter(node=node1))
-        self.assertItemsEqual([], Interface.objects.filter(node=node1))
+        self.assertCountEqual([], Interface.objects.filter(node=node1))
 
         # ... and ensure that the interface was deleted.
-        self.assertItemsEqual([], Interface.objects.filter(id=interface_id))
+        self.assertCountEqual([], Interface.objects.filter(id=interface_id))
 
     def test_deletes_virtual_interfaces_with_shared_mac(self):
         # Note: since this VLANInterface will be linked to the default VLAN
diff --git a/src/metadataserver/builtin_scripts/tests/test_network.py b/src/metadataserver/builtin_scripts/tests/test_network.py
index 093508e..9295119 100644
--- a/src/metadataserver/builtin_scripts/tests/test_network.py
+++ b/src/metadataserver/builtin_scripts/tests/test_network.py
@@ -2130,7 +2130,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
         self.assertEqual("bond0", bond0.name)
         self.assertTrue(bond0.enabled)
         self.assertEqual(bond0_untagged, bond0.vlan)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [parent.name for parent in bond0.parents.all()],
             ["eth0", "eth1"],
         )
@@ -2138,7 +2138,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             (address.alloc_type, address.ip, address.subnet)
             for address in bond0.ip_addresses.all()
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(IPADDRESS_TYPE.STICKY, bond0_ip, bond0_subnet)],
             bond0_addresses,
         )
@@ -2156,7 +2156,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             (address.alloc_type, address.ip, address.subnet)
             for address in bond0_vlan_nic.ip_addresses.all()
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(IPADDRESS_TYPE.STICKY, bond0_vlan_ip, bond0_vlan_subnet)],
             bond0_vlan_nic_addresses,
         )
@@ -2211,7 +2211,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
         self.assertEqual("br0", br0.name)
         self.assertTrue(br0.enabled)
         self.assertEqual(br0_untagged, br0.vlan)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [parent.name for parent in br0.parents.all()],
             ["eth0", "eth1"],
         )
@@ -2219,7 +2219,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             (address.alloc_type, address.ip, address.subnet)
             for address in br0.ip_addresses.all()
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(IPADDRESS_TYPE.STICKY, br0_ip, br0_subnet)], br0_addresses
         )
         br0_vlan_nic = VLANInterface.objects.get(
@@ -2236,7 +2236,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             (address.alloc_type, address.ip, address.subnet)
             for address in br0_vlan_nic.ip_addresses.all()
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(IPADDRESS_TYPE.STICKY, br0_vlan_ip, br0_vlan_subnet)],
             br0_vlan_nic_addresses,
         )
@@ -2371,7 +2371,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             (address.alloc_type, address.ip, address.subnet)
             for address in br0.ip_addresses.all()
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(IPADDRESS_TYPE.STICKY, br0_ip, br0_subnet)], br0_addresses
         )
         br0_nic = BridgeInterface.objects.get(
@@ -2503,7 +2503,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             (address.alloc_type, address.ip)
             for address in eth0.ip_addresses.all()
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [(IPADDRESS_TYPE.STICKY, "10.0.0.2")],
             eth0_addresses,
         )
@@ -2594,7 +2594,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
         ]
         self.update_interfaces(controller, data)
         eth0 = Interface.objects.get(name="eth0", node=controller)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             eth0.ip_addresses.values_list("ip", "subnet__cidr"),
             [
                 ("192.168.0.1", "192.168.0.0/24"),
diff --git a/src/metadataserver/models/tests/test_nodeuserdata.py b/src/metadataserver/models/tests/test_nodeuserdata.py
index 01f8447..1be190d 100644
--- a/src/metadataserver/models/tests/test_nodeuserdata.py
+++ b/src/metadataserver/models/tests/test_nodeuserdata.py
@@ -35,12 +35,12 @@ class TestNodeUserDataManager(MAASServerTestCase):
         node = factory.make_Node()
         NodeUserData.objects.set_user_data(node, b"original")
         NodeUserData.objects.set_user_data(node, None)
-        self.assertItemsEqual([], NodeUserData.objects.filter(node=node))
+        self.assertCountEqual([], NodeUserData.objects.filter(node=node))
 
     def test_set_user_data_to_None_when_none_exists_does_nothing(self):
         node = factory.make_Node()
         NodeUserData.objects.set_user_data(node, None)
-        self.assertItemsEqual([], NodeUserData.objects.filter(node=node))
+        self.assertCountEqual([], NodeUserData.objects.filter(node=node))
 
     def test_get_user_data_retrieves_data(self):
         node = factory.make_Node()
diff --git a/src/metadataserver/models/tests/test_script.py b/src/metadataserver/models/tests/test_script.py
index f9d0adb..a4fa24b 100644
--- a/src/metadataserver/models/tests/test_script.py
+++ b/src/metadataserver/models/tests/test_script.py
@@ -411,4 +411,4 @@ class TestScript(MAASServerTestCase):
         for hw_type, hw_type_label in HARDWARE_TYPE_CHOICES:
             script.hardware_type = hw_type
             script.save()
-            self.assertItemsEqual([hw_type_label.lower()], script.tags)
+            self.assertEqual([hw_type_label.lower()], script.tags)
diff --git a/src/metadataserver/models/tests/test_scriptresult.py b/src/metadataserver/models/tests/test_scriptresult.py
index ddd5eb0..3030094 100644
--- a/src/metadataserver/models/tests/test_scriptresult.py
+++ b/src/metadataserver/models/tests/test_scriptresult.py
@@ -850,7 +850,7 @@ class TestScriptResult(MAASServerTestCase):
         # Script result from another node
         factory.make_ScriptResult(script=script)
         script_result = script_results[-1]
-        self.assertItemsEqual(script_results, script_result.history)
+        self.assertCountEqual(script_results, script_result.history)
 
     def test_history_without_script(self):
         script_name = factory.make_name("script_name")
@@ -864,7 +864,7 @@ class TestScriptResult(MAASServerTestCase):
         # Script result from another node
         factory.make_ScriptResult(script_name=script_name)
         script_result = script_results[-1]
-        self.assertItemsEqual(script_results, script_result.history)
+        self.assertCountEqual(script_results, script_result.history)
 
     def test_history_query_count(self):
         script_name = factory.make_name("script_name")
@@ -908,7 +908,7 @@ class TestScriptResult(MAASServerTestCase):
         # Script from another node
         factory.make_ScriptResult(script=script)
         script_result = script_results[-1]
-        self.assertItemsEqual(script_results, script_result.history)
+        self.assertCountEqual(script_results, script_result.history)
 
     def test_not_suppressed_by_default(self):
         script_result = factory.make_ScriptResult()
diff --git a/src/metadataserver/models/tests/test_scriptset.py b/src/metadataserver/models/tests/test_scriptset.py
index ad37878..e1f1964 100644
--- a/src/metadataserver/models/tests/test_scriptset.py
+++ b/src/metadataserver/models/tests/test_scriptset.py
@@ -158,7 +158,7 @@ class TestScriptSetManager(MAASServerTestCase):
 
         expected_scripts = list(NODE_INFO_SCRIPTS)
         expected_scripts += [script.name for script in custom_scripts]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_scripts,
             [script_result.name for script_result in script_set],
         )
@@ -187,7 +187,7 @@ class TestScriptSetManager(MAASServerTestCase):
             for script_name, data in NODE_INFO_SCRIPTS.items()
             if data["run_on_controller"]
         ]
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_scripts,
             [script_result.name for script_result in script_set],
         )
@@ -208,7 +208,7 @@ class TestScriptSetManager(MAASServerTestCase):
 
         script_set = ScriptSet.objects.create_commissioning_script_set(node)
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_scripts,
             [script_result.name for script_result in script_set],
         )
@@ -225,7 +225,7 @@ class TestScriptSetManager(MAASServerTestCase):
             node, scripts="none"
         )
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             list(NODE_INFO_SCRIPTS),
             [script_result.name for script_result in script_set],
         )
@@ -268,7 +268,7 @@ class TestScriptSetManager(MAASServerTestCase):
                 node, script.tags
             )
 
-            self.assertItemsEqual(
+            self.assertCountEqual(
                 expected_scripts,
                 [script_result.name for script_result in script_set],
             )
@@ -314,7 +314,7 @@ class TestScriptSetManager(MAASServerTestCase):
                 node, [other_script.name]
             )
 
-            self.assertItemsEqual(
+            self.assertCountEqual(
                 expected_scripts,
                 [script_result.name for script_result in script_set],
             )
@@ -343,7 +343,7 @@ class TestScriptSetManager(MAASServerTestCase):
 
         script_set = ScriptSet.objects.create_commissioning_script_set(node)
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_scripts,
             [script_result.name for script_result in script_set],
         )
@@ -380,7 +380,7 @@ class TestScriptSetManager(MAASServerTestCase):
                 script_selected_by_id.id,
             ],
         )
-        self.assertItemsEqual(
+        self.assertCountEqual(
             set(expected_scripts),
             [script_result.name for script_result in script_set],
         )
@@ -608,7 +608,7 @@ class TestScriptSetManager(MAASServerTestCase):
             node, [script.name], {script.name: {"storage": "all"}}
         )
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [bd.name for bd in node.physicalblockdevice_set],
             [
                 script_result.parameters["storage"]["value"]["name"]
@@ -649,7 +649,7 @@ class TestScriptSetManager(MAASServerTestCase):
 
         script_set = ScriptSet.objects.create_testing_script_set(node)
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             expected_scripts,
             [script_result.name for script_result in script_set],
         )
@@ -688,7 +688,7 @@ class TestScriptSetManager(MAASServerTestCase):
             ],
         )
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             set(expected_scripts),
             [script_result.name for script_result in script_set],
         )
@@ -892,7 +892,7 @@ class TestScriptSetManager(MAASServerTestCase):
             node, [script.name], {script.name: {"storage": "all"}}
         )
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [bd.name for bd in node.physicalblockdevice_set],
             [
                 script_result.parameters["storage"]["value"]["name"]
@@ -921,7 +921,7 @@ class TestScriptSetManager(MAASServerTestCase):
         node = factory.make_Node()
 
         script_set = ScriptSet.objects.create_installation_script_set(node)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [CURTIN_INSTALL_LOG],
             [script_result.name for script_result in script_set],
         )
@@ -1043,7 +1043,7 @@ class TestScriptSetManager(MAASServerTestCase):
         )
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         script_set = ScriptSet.objects.create_deployed_machine_script_set(node)
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 (script_result.script, script_result.status)
                 for script_result in script_set.scriptresult_set.all()
@@ -1241,7 +1241,7 @@ class TestScriptSet(MAASServerTestCase):
 
         script_set.select_for_hardware_scripts()
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             list(NODE_INFO_SCRIPTS),
             [script_result.name for script_result in script_set],
         )
@@ -1277,7 +1277,7 @@ class TestScriptSet(MAASServerTestCase):
             ]
             script_set.select_for_hardware_scripts()
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             list(NODE_INFO_SCRIPTS) + [script.name],
             [script_result.name for script_result in script_set],
         )
@@ -1295,7 +1295,7 @@ class TestScriptSet(MAASServerTestCase):
 
         script_set.select_for_hardware_scripts()
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             list(NODE_INFO_SCRIPTS) + [script.name],
             [script_result.name for script_result in script_set],
         )
@@ -1318,7 +1318,7 @@ class TestScriptSet(MAASServerTestCase):
 
         script_set.select_for_hardware_scripts()
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             list(NODE_INFO_SCRIPTS) + [script.name],
             [script_result.name for script_result in script_set],
         )
@@ -1630,7 +1630,7 @@ class TestScriptSet(MAASServerTestCase):
         script_set.regenerate()
 
         self.assertIsNone(reload_object(pending_storage_script_result))
-        self.assertItemsEqual([], list(script_set))
+        self.assertEqual([], list(script_set))
         expected_msg = (
             "Removing Script %s from ScriptSet due to regeneration "
             "error - {'runtime': ['Must be an int']}"
diff --git a/src/metadataserver/tests/test_api.py b/src/metadataserver/tests/test_api.py
index aedc12e..0645a56 100644
--- a/src/metadataserver/tests/test_api.py
+++ b/src/metadataserver/tests/test_api.py
@@ -809,7 +809,7 @@ class TestMetadataCommon(MAASServerTestCase):
         url = reverse(view_name, args=["latest", ""])
         response = client.get(url)
         self.assertIn("text/plain", response["Content-Type"])
-        self.assertItemsEqual(
+        self.assertCountEqual(
             MetaDataHandler.subfields,
             [
                 field.decode(settings.DEFAULT_CHARSET)
@@ -2080,12 +2080,12 @@ class TestMAASScripts(MAASServerTestCase):
         )
         self.assertEqual("application/x-tar", response["Content-Type"])
         tar = tarfile.open(mode="r", fileobj=BytesIO(response.content))
-        commissioning_scripts = [
+        commissioning_scripts = {
             name.split("/", 1)[-1]
             for name in tar.getnames()
             if name.startswith("commissioning/")
-        ]
-        self.assertCountEqual(NODE_INFO_SCRIPTS.keys(), commissioning_scripts)
+        }
+        self.assertEqual(NODE_INFO_SCRIPTS.keys(), commissioning_scripts)
 
         end_time = ceil(time.time())
 
@@ -3587,9 +3587,9 @@ class TestNewAPI(MAASServerTestCase):
         self.assertThat(response, HasStatusCode(http.client.OK))
         node = reload_object(node)
         self.assertIsNotNone(node.current_commissioning_script_set)
-        self.assertItemsEqual(
+        self.assertEqual(
             NODE_INFO_SCRIPTS.keys(),
-            [script.name for script in node.current_commissioning_script_set],
+            {script.name for script in node.current_commissioning_script_set},
         )
         self.assertIsNone(node.current_testing_script_set)
         self.assertEqual(NODE_STATUS.COMMISSIONING, node.status)
diff --git a/src/metadataserver/tests/test_api_twisted.py b/src/metadataserver/tests/test_api_twisted.py
index fc27925..551dcd0 100644
--- a/src/metadataserver/tests/test_api_twisted.py
+++ b/src/metadataserver/tests/test_api_twisted.py
@@ -467,7 +467,7 @@ class TestStatusWorkerService(MAASServerTestCase):
             NODE_STATUS.FAILED_COMMISSIONING, reload_object(node).status
         )
         # Check last node event.
-        self.assertItemsEqual(
+        self.assertEqual(
             [
                 "'curtin' Commissioning",
                 "Commissioning failed, cloud-init reported a failure (refer "
diff --git a/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py b/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py
index 278df5b..b7d9201 100644
--- a/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py
+++ b/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py
@@ -1622,7 +1622,7 @@ class TestParseParameters(MAASTestCase):
         ).encode()
         maas_run_remote_scripts._block_devices = None
 
-        self.assertItemsEqual(expected_blockdevs, get_block_devices())
+        self.assertCountEqual(expected_blockdevs, get_block_devices())
         self.assertTrue(mock_get_storage_model_from_udev.called)
 
     def test_get_block_devices_cached(self):
@@ -1630,7 +1630,7 @@ class TestParseParameters(MAASTestCase):
         mock_check_output = self.patch(maas_run_remote_scripts, "check_output")
         maas_run_remote_scripts._block_devices = block_devices
 
-        self.assertItemsEqual(block_devices, get_block_devices())
+        self.assertCountEqual(block_devices, get_block_devices())
         self.assertThat(mock_check_output, MockNotCalled())
 
     def test_get_block_devices_cached_error(self):
@@ -1882,7 +1882,7 @@ class TestParseParameters(MAASTestCase):
             if param["type"] == "interface"
         }
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 os.path.join(scripts_dir, script["path"]),
                 "--runtime=%s" % script["parameters"]["runtime"]["value"],
@@ -1961,7 +1961,7 @@ class TestParseParameters(MAASTestCase):
             if param["type"] == "interface"
         }
 
-        self.assertItemsEqual(
+        self.assertCountEqual(
             [
                 os.path.join(scripts_dir, script["path"]),
                 "--foo",
diff --git a/src/metadataserver/user_data/tests/test_snippets.py b/src/metadataserver/user_data/tests/test_snippets.py
index ef66f1a..6edb441 100644
--- a/src/metadataserver/user_data/tests/test_snippets.py
+++ b/src/metadataserver/user_data/tests/test_snippets.py
@@ -52,21 +52,19 @@ class TestSnippets(MAASTestCase):
         snippets_dir = self.make_dir()
         factory.make_file(snippets_dir, "snippet")
         factory.make_file(snippets_dir, ".backup.pyc")
-        self.assertItemsEqual(["snippet"], list_snippets(snippets_dir))
+        self.assertEqual(["snippet"], list_snippets(snippets_dir))
 
     def test_get_snippet_context(self):
         contents = factory.make_string()
         snippets_dir = self.make_dir()
         factory.make_file(snippets_dir, "snippet.py", contents=contents)
         snippets = get_snippet_context(snippets_dir=snippets_dir)
-        self.assertItemsEqual(
-            ["base_user_data_sh", "snippet_py"], snippets.keys()
-        )
+        self.assertEqual({"base_user_data_sh", "snippet_py"}, snippets.keys())
         self.assertEqual(contents, snippets["snippet_py"])
 
     def test_get_snippet_always_contains_base_user_data(self):
         snippets_dir = self.make_dir()
-        self.assertItemsEqual(
-            ["base_user_data_sh"],
+        self.assertEqual(
+            {"base_user_data_sh"},
             get_snippet_context(snippets_dir=snippets_dir).keys(),
         )