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

Fix test suite

Browse Source 
It failed to consider that the tests run outside of dom0.
This commit is contained in:
Demi Marie Obenour 2020-11-26 20:48:43 -05:00
parent f4d93fd68e
commit 76cd08af00
No known key found for this signature in database
GPG Key ID: 28A45C93B0B5B6E0
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/tests/vm/dispvm.py
View File

@ -116,12 +116,16 @@ class TC_00_DispVM(qubes.tests.QubesTestCase):
dispvm = self.app.add_new_vm(qubes.vm.dispvm.DispVM, dispvm = self.app.add_new_vm(qubes.vm.dispvm.DispVM,
name='test-dispvm', template=self.appvm) name='test-dispvm', template=self.appvm)
dispvm.template = self.appvm
dispvm.start()
if not self.app.vmm.offline_mode:
assert not dispvm.is_halted()
with self.assertRaises(qubes.exc.QubesVMNotHaltedError): with self.assertRaises(qubes.exc.QubesVMNotHaltedError):
dispvm.template = self.appvm dispvm.template = self.appvm
with self.assertRaises(qubes.exc.QubesVMNotHaltedError): with self.assertRaises(qubes.exc.QubesValueError):
dispvm.template = qubes.property.DEFAULT dispvm.template = qubes.property.DEFAULT
dispvm.kill() dispvm.kill()
dispvm.template = qubes.property.DEFAULT dispvm.template = self.appvm
def test_003_dvmtemplate_template_change(self): def test_003_dvmtemplate_template_change(self):
self.appvm.template_for_dispvms = True self.appvm.template_for_dispvms = True
@ -137,7 +141,7 @@ class TC_00_DispVM(qubes.tests.QubesTestCase):
self.dispvm = self.app.add_new_vm(qubes.vm.dispvm.DispVM, self.dispvm = self.app.add_new_vm(qubes.vm.dispvm.DispVM,
name='test-dispvm', template=self.appvm) name='test-dispvm', template=self.appvm)
with self.assertRaises(qubes.exc.QubesVMInUseError): with self.assertRaises(qubes.exc.QubesVMNotHaltedError):
self.appvm.template = self.template self.appvm.template = self.template
with self.assertRaises(qubes.exc.QubesValueError): with self.assertRaises(qubes.exc.QubesValueError):
self.appvm.template = qubes.property.DEFAULT self.appvm.template = qubes.property.DEFAULT

4
run-tests
View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh --
set -eu
sudo dnf -y install lvm2 python3-inotify python3-sphinx python3-docutils python3-PyYAML python3-jinja2 python3-lxml python3-pylint python3-coverage
CLEANUP_LVM= CLEANUP_LVM=
if sudo --non-interactive $(dirname "$0")/ci/lvm-manage setup-lvm vg$$/pool; then if sudo --non-interactive $(dirname "$0")/ci/lvm-manage setup-lvm vg$$/pool; then
export DEFAULT_LVM_POOL=vg$$/pool export DEFAULT_LVM_POOL=vg$$/pool