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

tests: root fs resize tests - for all templates

Browse Source 
Check resize on each template separately, because it involves VM's
scripts (either qubes.ResizeDisk service, or some startup script).

QubesOS/qubes-issues#3173
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-20 02:47:50 +02:00
parent 77ce956c2d
commit c2c3225622
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubes/tests/integ/basic.py
View File

@ -526,10 +526,10 @@ class TC_30_Gui_daemon(qubes.tests.SystemTestCase):
self.assertEqual(clipboard_source, "", self.assertEqual(clipboard_source, "",
"Clipboard not wiped after paste - owner") "Clipboard not wiped after paste - owner")
class TC_05_StandaloneVM(qubes.tests.SystemTestCase): class TC_05_StandaloneVMMixin(object):
def setUp(self): def setUp(self):
super(TC_05_StandaloneVM, self).setUp() super(TC_05_StandaloneVMMixin, self).setUp()
self.init_default_template() self.init_default_template(self.template)
def test_000_create_start(self): def test_000_create_start(self):
self.testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM, self.testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM,
@ -541,8 +541,6 @@ class TC_05_StandaloneVM(qubes.tests.SystemTestCase):
self.loop.run_until_complete(self.testvm1.start()) self.loop.run_until_complete(self.testvm1.start())
self.assertEqual(self.testvm1.get_power_state(), "Running") self.assertEqual(self.testvm1.get_power_state(), "Running")
# current qubes-core-agent do not call resize2fs on VM startup, also #3173
@unittest.expectedFailure
def test_100_resize_root_img(self): def test_100_resize_root_img(self):
self.testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM, self.testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM,
name=self.make_vm_name('vm1'), label='red') name=self.make_vm_name('vm1'), label='red')
@ -566,8 +564,6 @@ class TC_05_StandaloneVM(qubes.tests.SystemTestCase):
# some safety margin for FS metadata # some safety margin for FS metadata
self.assertGreater(int(new_size.strip()), 19 * 1024 ** 2) self.assertGreater(int(new_size.strip()), 19 * 1024 ** 2)
# See issue #3173
@unittest.expectedFailure
def test_101_resize_root_img_online(self): def test_101_resize_root_img_online(self):
self.testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM, self.testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM,
name=self.make_vm_name('vm1'), label='red') name=self.make_vm_name('vm1'), label='red')
@ -593,4 +589,14 @@ class TC_05_StandaloneVM(qubes.tests.SystemTestCase):
self.assertGreater(int(new_size.strip()), 19 * 1024 ** 2) self.assertGreater(int(new_size.strip()), 19 * 1024 ** 2)
def load_tests(loader, tests, pattern):
for template in qubes.tests.list_templates():
tests.addTests(loader.loadTestsFromTestCase(
type(
'TC_05_StandaloneVM_' + template,
(TC_05_StandaloneVMMixin, qubes.tests.SystemTestCase),
{'template': template})))
return tests
# vim: ts=4 sw=4 et # vim: ts=4 sw=4 et