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

tests: remove obsolete tests, formatting

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-03 21:57:08 +02:00
parent 04fd2ff34a
commit 313d7422e7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qubes/tests/vm/qubesvm.py
View File

@ -33,6 +33,7 @@ import qubes.config
import qubes.vm.qubesvm import qubes.vm.qubesvm
import qubes.tests import qubes.tests
import qubes.tests.vm
class TestApp(object): class TestApp(object):
labels = {1: qubes.Label(1, '0xcc0000', 'red')} labels = {1: qubes.Label(1, '0xcc0000', 'red')}
@ -210,7 +211,7 @@ class QubesVMTestsMixin(object):
self.assertPropertyInvalidValue(vm, prop_name, '') self.assertPropertyInvalidValue(vm, prop_name, '')
class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase): class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
def test_000_init(self): def test_000_init(self):
self.get_vm() self.get_vm()
@ -429,35 +430,6 @@ class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase):
'qubes-vm@{}.service'.format(vm.name)), 'qubes-vm@{}.service'.format(vm.name)),
"systemd service not disabled by resetting autostart") "systemd service not disabled by resetting autostart")
@unittest.skip('TODO')
def test_300_qrexec_installed(self):
vm = self.get_vm()
self._test_generic_bool_property(vm, 'qrexec_installed', True)
@unittest.skip('TODO')
def test_301_qrexec_installed_default(self):
vm = self.get_vm()
vm.hvm = False
self.assertPropertyDefaultValue(vm, 'qrexec_installed', True)
vm.hvm = True
self.assertPropertyDefaultValue(vm, 'qrexec_installed', False)
# TODO: check inheritance from a template - in appvm copy of this test
@unittest.skip('TODO')
def test_310_guiagent_installed(self):
vm = self.get_vm()
self._test_generic_bool_property(vm, 'guiagent_installed', True)
# TODO: check inheritance from a template - in appvm copy of this test
@unittest.skip('TODO')
def test_311_guiagent_installed_default(self):
vm = self.get_vm()
vm.hvm = False
self.assertPropertyDefaultValue(vm, 'guiagent_installed', True)
vm.hvm = True
self.assertPropertyDefaultValue(vm, 'guiagent_installed', False)
# TODO: check inheritance from a template - in appvm copy of this test
@unittest.skip('TODO') @unittest.skip('TODO')
def test_320_seamless_gui_mode(self): def test_320_seamless_gui_mode(self):
vm = self.get_vm() vm = self.get_vm()
@ -521,11 +493,6 @@ class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase):
# ('drive.img', '', False), # ('drive.img', '', False),
# ]) # ])
@unittest.skip('TODO')
def test_370_pci_strictreset(self):
vm = self.get_vm()
self._test_generic_bool_property(vm, 'pci_strictreset')
def test_400_backup_timestamp(self): def test_400_backup_timestamp(self):
vm = self.get_vm() vm = self.get_vm()
timestamp = datetime.datetime(2016, 1, 1, 12, 14, 2) timestamp = datetime.datetime(2016, 1, 1, 12, 14, 2)