utils: include management_dispvm property when checking where VM is used

Fixes QubesOS/qubes-issues#4812
This commit is contained in:
Marek Marczykowski-Górecki 2019-02-18 23:09:31 +01:00
父節點 bde60c154a
當前提交 2ad9b57961
沒有發現已知的金鑰在資料庫的簽署中
GPG Key ID: 063938BA42CFA724
共有 2 個文件被更改,包括 7 次插入4 次删除

查看文件

@ -36,7 +36,8 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
b'sys-firewall class=AppVM state=Running\n'
self.global_properties = ['default_dispvm', 'default_netvm',
'default_template', 'clockvm', 'updatevm']
'default_template', 'clockvm', 'updatevm',
'management_dispvm']
for prop in self.global_properties:
self.app.expected_calls[
@ -45,7 +46,8 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
self.vms = ['vm1', 'vm2', 'sys-net', 'sys-firewall',
'template1', 'template2']
self.vm_properties = ['template', 'netvm', 'default_dispvm']
self.vm_properties = ['template', 'netvm', 'default_dispvm',
'management_dispvm']
for vm in self.vms:
for prop in self.vm_properties:

查看文件

@ -126,13 +126,14 @@ def vm_dependencies(app, reference_vm):
result = []
global_properties = ['default_dispvm', 'default_netvm',
'default_template', 'clockvm', 'updatevm']
'default_template', 'clockvm', 'updatevm',
'management_dispvm']
for prop in global_properties:
if reference_vm == getattr(app, prop, None):
result.append((None, prop))
vm_properties = ['template', 'netvm', 'default_dispvm']
vm_properties = ['template', 'netvm', 'default_dispvm', 'management_dispvm']
for vm in app.domains:
for prop in vm_properties: