From 0099aa1037a5e8dd41ee9f6ca0cf4f17d4a10817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 23 Dec 2018 14:56:47 +0100 Subject: [PATCH] tests: adjust backupcompat for new maxmem handling 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. --- qubes/tests/integ/backupcompatibility.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/qubes/tests/integ/backupcompatibility.py b/qubes/tests/integ/backupcompatibility.py index 88c3708a..1093de83 100644 --- a/qubes/tests/integ/backupcompatibility.py +++ b/qubes/tests/integ/backupcompatibility.py @@ -424,17 +424,14 @@ class TC_00_BackupCompatibility( 'default_user': qubes.property.DEFAULT, 'include_in_backups': True, 'debug': False, - 'maxmem': 1535, + 'maxmem': min(int(self.app.host.memory_total / 1024 / 2), 4000), 'memory': 400, - 'features': { - 'service.meminfo-writer': '1', - }, + 'features': {}, } template_standalone_props = common_props.copy() template_standalone_props['features'] = { 'qrexec': '1', 'gui': '1', - 'service.meminfo-writer': '1', } self.assertRestored("test-template-clone", klass=qubes.vm.templatevm.TemplateVM, @@ -482,17 +479,14 @@ class TC_00_BackupCompatibility( 'default_user': qubes.property.DEFAULT, 'include_in_backups': True, 'debug': False, - 'maxmem': 1535, # 4063 caped by 10*400 + 'maxmem': min(int(self.app.host.memory_total / 1024 / 2), 4000), 'memory': 400, - 'features': { - 'service.meminfo-writer': '1', - }, + 'features': {}, } template_standalone_props = common_props.copy() template_standalone_props['features'] = { 'qrexec': '1', 'gui': '1', - 'service.meminfo-writer': '1', } self.assertRestored("test-template-clone", klass=qubes.vm.templatevm.TemplateVM,