diff --git a/qubesadmin/tests/utils.py b/qubesadmin/tests/utils.py index 9e8ea54..04833e2 100644 --- a/qubesadmin/tests/utils.py +++ b/qubesadmin/tests/utils.py @@ -60,25 +60,25 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase): b'2\0QubesNoSuchPropertyError\0\0invalid property\0' def test_00_only_global(self): - result = qubesadmin.utils.vm_usage(self.app, self.app.domains['vm2']) + result = qubesadmin.utils.vm_dependencies(self.app, self.app.domains['vm2']) self.assertListEqual(result, [(None, prop) for prop in self.global_properties], "Incorrect global properties listed.") def test_01_only_vm(self): - result = qubesadmin.utils.vm_usage( + result = qubesadmin.utils.vm_dependencies( self.app, self.app.domains['template1']) - self.assertCountEqual( - result, - [(vm, prop) for vm in self.vms for prop in self.vm_properties - if (not vm.startswith('template') - or not prop.startswith('template'))], + self.assertSetEqual( + set(result), + set([(vm, prop) for vm in self.vms for prop in self.vm_properties + if (not vm.startswith('template') + or not prop.startswith('template'))]), "Incorrect VM properties listed.") def test_02_empty(self): - result = qubesadmin.utils.vm_usage(self.app, self.app.domains['vm1']) + result = qubesadmin.utils.vm_dependencies(self.app, self.app.domains['vm1']) self.assertListEqual(result, [], "Incorrect use found.") @@ -86,7 +86,7 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase): self.app.expected_calls[ ('dom0', 'admin.property.Get', 'default_dispvm', None)] = b'' - result = qubesadmin.utils.vm_usage(self.app, self.app.domains['vm1']) + result = qubesadmin.utils.vm_dependencies(self.app, self.app.domains['vm1']) self.assertListEqual(result, [], "Incorrect use found.") @@ -99,7 +99,7 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase): ('vm1', 'admin.vm.property.Get', 'netvm', None)] = \ b'0\x00default=False type=vm sys-net' - result = qubesadmin.utils.vm_usage(self.app, - self.app.domains['sys-net']) + result = qubesadmin.utils.vm_dependencies(self.app, + self.app.domains['sys-net']) self.assertListEqual(result, [(self.app.domains['vm1'], 'netvm')]) diff --git a/qubesadmin/utils.py b/qubesadmin/utils.py index 9c15a4f..ccb3134 100644 --- a/qubesadmin/utils.py +++ b/qubesadmin/utils.py @@ -116,12 +116,12 @@ def updates_vms_status(qvm_collection): return None return status -# Helper function that returns a list of all the places a given VM is used in. -# Output is a list of tuples (property_holder, property_name), with None as -# property_holder for global properties - -def vm_usage(app, reference_vm): +def vm_dependencies(app, reference_vm): + '''Helper function that returns a list of all the places a given VM is used + in. Output is a list of tuples (property_holder, property_name), with None + as property_holder for global properties + ''' result = []