Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: adjust backupcompat for new maxmem handling

Browse Source 
Since 4dc86310 "Use maxmem=0 to disable qmemman, add more automation to
it" meminfo-writer service is not accessible directly. maxmem property
is used to encode memory management instead.
This commit is contained in:
Marek Marczykowski-Górecki 2018-12-23 14:56:47 +01:00
parent c5cd3628c6
commit 0099aa1037
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qubes/tests/integ/backupcompatibility.py
View File

@ -424,17 +424,14 @@ class TC_00_BackupCompatibility(
'default_user': qubes.property.DEFAULT, 'default_user': qubes.property.DEFAULT,
'include_in_backups': True, 'include_in_backups': True,
'debug': False, 'debug': False,
'maxmem': 1535, 'maxmem': min(int(self.app.host.memory_total / 1024 / 2), 4000),
'memory': 400, 'memory': 400,
'features': { 'features': {},
'service.meminfo-writer': '1',
},
} }
template_standalone_props = common_props.copy() template_standalone_props = common_props.copy()
template_standalone_props['features'] = { template_standalone_props['features'] = {
'qrexec': '1', 'qrexec': '1',
'gui': '1', 'gui': '1',
'service.meminfo-writer': '1',
} }
self.assertRestored("test-template-clone", self.assertRestored("test-template-clone",
klass=qubes.vm.templatevm.TemplateVM, klass=qubes.vm.templatevm.TemplateVM,
@ -482,17 +479,14 @@ class TC_00_BackupCompatibility(
'default_user': qubes.property.DEFAULT, 'default_user': qubes.property.DEFAULT,
'include_in_backups': True, 'include_in_backups': True,
'debug': False, 'debug': False,
'maxmem': 1535, # 4063 caped by 10*400 'maxmem': min(int(self.app.host.memory_total / 1024 / 2), 4000),
'memory': 400, 'memory': 400,
'features': { 'features': {},
'service.meminfo-writer': '1',
},
} }
template_standalone_props = common_props.copy() template_standalone_props = common_props.copy()
template_standalone_props['features'] = { template_standalone_props['features'] = {
'qrexec': '1', 'qrexec': '1',
'gui': '1', 'gui': '1',
'service.meminfo-writer': '1',
} }
self.assertRestored("test-template-clone", self.assertRestored("test-template-clone",
klass=qubes.vm.templatevm.TemplateVM, klass=qubes.vm.templatevm.TemplateVM,