2014-10-02 10:56:04 +02:00
|
|
|
#!/usr/bin/python
|
2015-02-05 15:46:40 +01:00
|
|
|
# vim: fileencoding=utf-8
|
|
|
|
|
2014-10-02 10:56:04 +02:00
|
|
|
#
|
2015-02-05 15:46:40 +01:00
|
|
|
# The Qubes OS Project, https://www.qubes-os.org/
|
2014-10-02 10:56:04 +02:00
|
|
|
#
|
2015-02-05 15:46:40 +01:00
|
|
|
# Copyright (C) 2014-2015
|
|
|
|
# Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
|
|
|
# Copyright (C) 2015 Wojtek Porczyk <woju@invisiblethingslab.com>
|
2014-10-02 10:56:04 +02:00
|
|
|
#
|
2015-02-05 15:46:40 +01:00
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
2014-10-02 10:56:04 +02:00
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
2015-02-05 15:46:40 +01:00
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License along
|
|
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2014-10-02 10:56:04 +02:00
|
|
|
#
|
2015-02-05 15:46:40 +01:00
|
|
|
|
2014-10-22 02:15:32 +02:00
|
|
|
import multiprocessing
|
2014-10-02 10:56:04 +02:00
|
|
|
import os
|
|
|
|
import shutil
|
2015-10-05 05:46:07 +02:00
|
|
|
import subprocess
|
2016-01-18 02:09:17 +01:00
|
|
|
import tempfile
|
2014-10-02 10:56:04 +02:00
|
|
|
|
|
|
|
import unittest
|
2014-10-22 02:15:32 +02:00
|
|
|
import time
|
2014-10-02 10:56:04 +02:00
|
|
|
from qubes.qubes import QubesVmCollection, QubesException, system_path
|
2016-02-06 05:36:53 +01:00
|
|
|
import libvirt
|
2014-10-02 10:56:04 +02:00
|
|
|
|
2015-02-05 15:46:40 +01:00
|
|
|
import qubes.qubes
|
|
|
|
import qubes.tests
|
2015-07-08 04:26:11 +02:00
|
|
|
from qubes.qubes import QubesVmLabels
|
|
|
|
|
2014-10-02 10:56:04 +02:00
|
|
|
|
2015-02-11 14:26:29 +01:00
|
|
|
class TC_00_Basic(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
|
2015-02-05 15:46:40 +01:00
|
|
|
def test_000_create(self):
|
|
|
|
vmname = self.make_vm_name('appvm')
|
|
|
|
vm = self.qc.add_new_vm('QubesAppVm',
|
|
|
|
name=vmname, template=self.qc.get_default_template())
|
2014-10-02 10:56:04 +02:00
|
|
|
|
|
|
|
self.assertIsNotNone(vm)
|
|
|
|
self.assertEqual(vm.name, vmname)
|
|
|
|
self.assertEqual(vm.template, self.qc.get_default_template())
|
|
|
|
vm.create_on_disk(verbose=False)
|
2015-02-05 15:46:40 +01:00
|
|
|
|
|
|
|
with self.assertNotRaises(qubes.qubes.QubesException):
|
2014-10-02 10:56:04 +02:00
|
|
|
vm.verify_files()
|
|
|
|
|
2014-10-22 02:15:32 +02:00
|
|
|
|
2015-02-11 14:26:29 +01:00
|
|
|
class TC_01_Properties(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
|
2014-10-02 10:56:04 +02:00
|
|
|
def setUp(self):
|
2015-02-05 15:46:40 +01:00
|
|
|
super(TC_01_Properties, self).setUp()
|
|
|
|
self.vmname = self.make_vm_name('appvm')
|
|
|
|
self.vm = self.qc.add_new_vm('QubesAppVm',
|
|
|
|
name=self.vmname, template=self.qc.get_default_template())
|
2014-10-02 10:56:04 +02:00
|
|
|
self.vm.create_on_disk(verbose=False)
|
|
|
|
|
2015-04-06 02:53:18 +02:00
|
|
|
def save_and_reload_db(self):
|
|
|
|
super(TC_01_Properties, self).save_and_reload_db()
|
|
|
|
if hasattr(self, 'vm'):
|
|
|
|
self.vm = self.qc.get(self.vm.qid, None)
|
|
|
|
if hasattr(self, 'netvm'):
|
|
|
|
self.netvm = self.qc.get(self.netvm.qid, None)
|
|
|
|
|
2015-02-05 15:46:40 +01:00
|
|
|
def test_000_rename(self):
|
|
|
|
newname = self.make_vm_name('newname')
|
2014-10-02 10:56:04 +02:00
|
|
|
|
|
|
|
self.assertEqual(self.vm.name, self.vmname)
|
2015-08-04 18:12:36 +02:00
|
|
|
self.vm.write_firewall_conf({'allow': False, 'allowDns': False})
|
2015-09-30 22:27:15 +02:00
|
|
|
self.vm.autostart = True
|
|
|
|
self.addCleanup(os.system,
|
|
|
|
'sudo systemctl -q disable qubes-vm@{}.service || :'.
|
|
|
|
format(self.vmname))
|
2015-08-04 18:12:36 +02:00
|
|
|
pre_rename_firewall = self.vm.get_firewall_conf()
|
2015-02-05 15:46:40 +01:00
|
|
|
|
2014-10-02 10:56:04 +02:00
|
|
|
#TODO: change to setting property when implemented
|
|
|
|
self.vm.set_name(newname)
|
|
|
|
self.assertEqual(self.vm.name, newname)
|
|
|
|
self.assertEqual(self.vm.dir_path,
|
2015-02-05 15:46:40 +01:00
|
|
|
os.path.join(system_path['qubes_appvms_dir'], newname))
|
2014-10-02 10:56:04 +02:00
|
|
|
self.assertEqual(self.vm.conf_file,
|
2015-02-05 15:46:40 +01:00
|
|
|
os.path.join(self.vm.dir_path, newname + '.conf'))
|
2014-10-02 10:56:04 +02:00
|
|
|
self.assertTrue(os.path.exists(
|
|
|
|
os.path.join(self.vm.dir_path, "apps", newname + "-vm.directory")))
|
|
|
|
# FIXME: set whitelisted-appmenus.list first
|
|
|
|
self.assertTrue(os.path.exists(
|
|
|
|
os.path.join(self.vm.dir_path, "apps", newname + "-firefox.desktop")))
|
|
|
|
self.assertTrue(os.path.exists(
|
|
|
|
os.path.join(os.getenv("HOME"), ".local/share/desktop-directories",
|
2015-02-05 15:46:40 +01:00
|
|
|
newname + "-vm.directory")))
|
2014-10-02 10:56:04 +02:00
|
|
|
self.assertTrue(os.path.exists(
|
|
|
|
os.path.join(os.getenv("HOME"), ".local/share/applications",
|
2015-02-05 15:46:40 +01:00
|
|
|
newname + "-firefox.desktop")))
|
2014-10-02 10:56:04 +02:00
|
|
|
self.assertFalse(os.path.exists(
|
|
|
|
os.path.join(os.getenv("HOME"), ".local/share/desktop-directories",
|
2015-02-05 15:46:40 +01:00
|
|
|
self.vmname + "-vm.directory")))
|
2014-10-02 10:56:04 +02:00
|
|
|
self.assertFalse(os.path.exists(
|
|
|
|
os.path.join(os.getenv("HOME"), ".local/share/applications",
|
2015-02-05 15:46:40 +01:00
|
|
|
self.vmname + "-firefox.desktop")))
|
2015-08-04 18:12:36 +02:00
|
|
|
self.assertEquals(pre_rename_firewall, self.vm.get_firewall_conf())
|
2015-09-30 22:26:15 +02:00
|
|
|
with self.assertNotRaises((QubesException, OSError)):
|
2015-08-04 18:12:36 +02:00
|
|
|
self.vm.write_firewall_conf({'allow': False})
|
2015-09-30 22:27:15 +02:00
|
|
|
self.assertTrue(self.vm.autostart)
|
|
|
|
self.assertTrue(os.path.exists(
|
|
|
|
'/etc/systemd/system/multi-user.target.wants/'
|
|
|
|
'qubes-vm@{}.service'.format(newname)))
|
|
|
|
self.assertFalse(os.path.exists(
|
|
|
|
'/etc/systemd/system/multi-user.target.wants/'
|
|
|
|
'qubes-vm@{}.service'.format(self.vmname)))
|
2015-02-05 15:46:40 +01:00
|
|
|
|
2016-02-06 05:36:53 +01:00
|
|
|
def test_001_rename_libvirt_undefined(self):
|
|
|
|
self.vm.libvirt_domain.undefine()
|
|
|
|
self.vm._libvirt_domain = None
|
|
|
|
|
|
|
|
newname = self.make_vm_name('newname')
|
|
|
|
with self.assertNotRaises(libvirt.libvirtError):
|
|
|
|
self.vm.set_name(newname)
|
|
|
|
|
2015-04-06 02:53:18 +02:00
|
|
|
def test_010_netvm(self):
|
|
|
|
if self.qc.get_default_netvm() is None:
|
|
|
|
self.skip("Set default NetVM before running this test")
|
|
|
|
self.netvm = self.qc.add_new_vm("QubesNetVm",
|
|
|
|
name=self.make_vm_name('netvm'),
|
|
|
|
template=self.qc.get_default_template())
|
|
|
|
self.netvm.create_on_disk(verbose=False)
|
|
|
|
# TODO: remove this line after switching to core3
|
|
|
|
self.save_and_reload_db()
|
|
|
|
|
|
|
|
self.assertEquals(self.vm.netvm, self.qc.get_default_netvm())
|
|
|
|
self.vm.uses_default_netvm = False
|
|
|
|
self.vm.netvm = None
|
|
|
|
self.assertIsNone(self.vm.netvm)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.assertIsNone(self.vm.netvm)
|
|
|
|
|
|
|
|
self.vm.netvm = self.qc[self.netvm.qid]
|
|
|
|
self.assertEquals(self.vm.netvm.qid, self.netvm.qid)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.assertEquals(self.vm.netvm.qid, self.netvm.qid)
|
|
|
|
|
|
|
|
self.vm.uses_default_netvm = True
|
|
|
|
# TODO: uncomment when properly implemented
|
|
|
|
# self.assertEquals(self.vm.netvm.qid, self.qc.get_default_netvm().qid)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.assertEquals(self.vm.netvm.qid, self.qc.get_default_netvm().qid)
|
|
|
|
|
|
|
|
with self.assertRaises(ValueError):
|
|
|
|
self.vm.netvm = self.vm
|
|
|
|
|
|
|
|
def test_020_dispvm_netvm(self):
|
|
|
|
if self.qc.get_default_netvm() is None:
|
|
|
|
self.skip("Set default NetVM before running this test")
|
|
|
|
self.netvm = self.qc.add_new_vm("QubesNetVm",
|
|
|
|
name=self.make_vm_name('netvm'),
|
|
|
|
template=self.qc.get_default_template())
|
|
|
|
self.netvm.create_on_disk(verbose=False)
|
|
|
|
|
|
|
|
self.assertEquals(self.vm.netvm, self.vm.dispvm_netvm)
|
|
|
|
self.vm.uses_default_dispvm_netvm = False
|
|
|
|
self.vm.dispvm_netvm = None
|
|
|
|
self.assertIsNone(self.vm.dispvm_netvm)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.assertIsNone(self.vm.dispvm_netvm)
|
|
|
|
|
|
|
|
self.vm.dispvm_netvm = self.netvm
|
|
|
|
self.assertEquals(self.vm.dispvm_netvm, self.netvm)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.assertEquals(self.vm.dispvm_netvm, self.netvm)
|
|
|
|
|
|
|
|
self.vm.uses_default_dispvm_netvm = True
|
|
|
|
self.assertEquals(self.vm.dispvm_netvm, self.vm.netvm)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.assertEquals(self.vm.dispvm_netvm, self.vm.netvm)
|
|
|
|
|
|
|
|
with self.assertRaises(ValueError):
|
|
|
|
self.vm.dispvm_netvm = self.vm
|
|
|
|
|
2015-07-08 04:26:11 +02:00
|
|
|
def test_030_clone(self):
|
|
|
|
testvm1 = self.qc.add_new_vm(
|
|
|
|
"QubesAppVm",
|
|
|
|
name=self.make_vm_name("vm"),
|
|
|
|
template=self.qc.get_default_template())
|
|
|
|
testvm1.create_on_disk(verbose=False)
|
|
|
|
testvm2 = self.qc.add_new_vm(testvm1.__class__.__name__,
|
|
|
|
name=self.make_vm_name("clone"),
|
|
|
|
template=testvm1.template,
|
|
|
|
)
|
|
|
|
testvm2.clone_attrs(src_vm=testvm1)
|
|
|
|
testvm2.clone_disk_files(src_vm=testvm1, verbose=False)
|
|
|
|
|
|
|
|
# qubes.xml reload
|
|
|
|
self.save_and_reload_db()
|
|
|
|
testvm1 = self.qc[testvm1.qid]
|
|
|
|
testvm2 = self.qc[testvm2.qid]
|
|
|
|
|
|
|
|
self.assertEquals(testvm1.label, testvm2.label)
|
|
|
|
self.assertEquals(testvm1.netvm, testvm2.netvm)
|
|
|
|
self.assertEquals(testvm1.uses_default_netvm,
|
|
|
|
testvm2.uses_default_netvm)
|
|
|
|
self.assertEquals(testvm1.kernel, testvm2.kernel)
|
|
|
|
self.assertEquals(testvm1.kernelopts, testvm2.kernelopts)
|
|
|
|
self.assertEquals(testvm1.uses_default_kernel,
|
|
|
|
testvm2.uses_default_kernel)
|
|
|
|
self.assertEquals(testvm1.uses_default_kernelopts,
|
|
|
|
testvm2.uses_default_kernelopts)
|
|
|
|
self.assertEquals(testvm1.memory, testvm2.memory)
|
|
|
|
self.assertEquals(testvm1.maxmem, testvm2.maxmem)
|
|
|
|
self.assertEquals(testvm1.pcidevs, testvm2.pcidevs)
|
|
|
|
self.assertEquals(testvm1.include_in_backups,
|
|
|
|
testvm2.include_in_backups)
|
|
|
|
self.assertEquals(testvm1.default_user, testvm2.default_user)
|
|
|
|
self.assertEquals(testvm1.services, testvm2.services)
|
|
|
|
self.assertEquals(testvm1.get_firewall_conf(),
|
|
|
|
testvm2.get_firewall_conf())
|
|
|
|
|
|
|
|
# now some non-default values
|
|
|
|
testvm1.netvm = None
|
|
|
|
testvm1.uses_default_netvm = False
|
|
|
|
testvm1.label = QubesVmLabels['orange']
|
|
|
|
testvm1.memory = 512
|
|
|
|
firewall = testvm1.get_firewall_conf()
|
|
|
|
firewall['allowDns'] = False
|
|
|
|
firewall['allowYumProxy'] = False
|
|
|
|
firewall['rules'] = [{'address': '1.2.3.4',
|
|
|
|
'netmask': 24,
|
|
|
|
'proto': 'tcp',
|
|
|
|
'portBegin': 22,
|
|
|
|
'portEnd': 22,
|
|
|
|
}]
|
|
|
|
testvm1.write_firewall_conf(firewall)
|
|
|
|
|
|
|
|
testvm3 = self.qc.add_new_vm(testvm1.__class__.__name__,
|
|
|
|
name=self.make_vm_name("clone2"),
|
|
|
|
template=testvm1.template,
|
|
|
|
)
|
|
|
|
testvm3.clone_attrs(src_vm=testvm1)
|
|
|
|
testvm3.clone_disk_files(src_vm=testvm1, verbose=False)
|
|
|
|
|
|
|
|
# qubes.xml reload
|
|
|
|
self.save_and_reload_db()
|
|
|
|
testvm1 = self.qc[testvm1.qid]
|
|
|
|
testvm3 = self.qc[testvm3.qid]
|
|
|
|
|
|
|
|
self.assertEquals(testvm1.label, testvm3.label)
|
|
|
|
self.assertEquals(testvm1.netvm, testvm3.netvm)
|
|
|
|
self.assertEquals(testvm1.uses_default_netvm,
|
|
|
|
testvm3.uses_default_netvm)
|
|
|
|
self.assertEquals(testvm1.kernel, testvm3.kernel)
|
|
|
|
self.assertEquals(testvm1.kernelopts, testvm3.kernelopts)
|
|
|
|
self.assertEquals(testvm1.uses_default_kernel,
|
|
|
|
testvm3.uses_default_kernel)
|
|
|
|
self.assertEquals(testvm1.uses_default_kernelopts,
|
|
|
|
testvm3.uses_default_kernelopts)
|
|
|
|
self.assertEquals(testvm1.memory, testvm3.memory)
|
|
|
|
self.assertEquals(testvm1.maxmem, testvm3.maxmem)
|
|
|
|
self.assertEquals(testvm1.pcidevs, testvm3.pcidevs)
|
|
|
|
self.assertEquals(testvm1.include_in_backups,
|
|
|
|
testvm3.include_in_backups)
|
|
|
|
self.assertEquals(testvm1.default_user, testvm3.default_user)
|
|
|
|
self.assertEquals(testvm1.services, testvm3.services)
|
|
|
|
self.assertEquals(testvm1.get_firewall_conf(),
|
|
|
|
testvm3.get_firewall_conf())
|
2015-04-06 02:53:18 +02:00
|
|
|
|
2016-02-06 05:37:27 +01:00
|
|
|
def test_020_name_conflict_app(self):
|
|
|
|
with self.assertRaises(QubesException):
|
|
|
|
self.vm2 = self.qc.add_new_vm('QubesAppVm',
|
|
|
|
name=self.vmname, template=self.qc.get_default_template())
|
|
|
|
self.vm2.create_on_disk(verbose=False)
|
|
|
|
|
|
|
|
def test_021_name_conflict_hvm(self):
|
|
|
|
with self.assertRaises(QubesException):
|
|
|
|
self.vm2 = self.qc.add_new_vm('QubesHVm',
|
|
|
|
name=self.vmname, template=self.qc.get_default_template())
|
|
|
|
self.vm2.create_on_disk(verbose=False)
|
|
|
|
|
|
|
|
def test_022_name_conflict_net(self):
|
|
|
|
with self.assertRaises(QubesException):
|
|
|
|
self.vm2 = self.qc.add_new_vm('QubesNetVm',
|
|
|
|
name=self.vmname, template=self.qc.get_default_template())
|
|
|
|
self.vm2.create_on_disk(verbose=False)
|
|
|
|
|
|
|
|
def test_030_rename_conflict_app(self):
|
|
|
|
vm2name = self.make_vm_name('newname')
|
|
|
|
|
|
|
|
self.vm2 = self.qc.add_new_vm('QubesAppVm',
|
|
|
|
name=vm2name, template=self.qc.get_default_template())
|
|
|
|
self.vm2.create_on_disk(verbose=False)
|
|
|
|
|
|
|
|
with self.assertRaises(QubesException):
|
|
|
|
self.vm2.set_name(self.vmname)
|
|
|
|
|
|
|
|
def test_031_rename_conflict_net(self):
|
|
|
|
vm3name = self.make_vm_name('newname')
|
|
|
|
|
|
|
|
self.vm3 = self.qc.add_new_vm('QubesNetVm',
|
|
|
|
name=vm3name, template=self.qc.get_default_template())
|
|
|
|
self.vm3.create_on_disk(verbose=False)
|
|
|
|
|
|
|
|
with self.assertRaises(QubesException):
|
|
|
|
self.vm3.set_name(self.vmname)
|
|
|
|
|
|
|
|
|
2015-10-05 05:46:07 +02:00
|
|
|
class TC_02_QvmPrefs(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
|
|
|
|
def setup_appvm(self):
|
|
|
|
self.testvm = self.qc.add_new_vm(
|
|
|
|
"QubesAppVm",
|
|
|
|
name=self.make_vm_name("vm"),
|
|
|
|
template=self.qc.get_default_template())
|
|
|
|
self.testvm.create_on_disk(verbose=False)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
|
|
|
|
def setup_hvm(self):
|
|
|
|
self.testvm = self.qc.add_new_vm(
|
|
|
|
"QubesHVm",
|
|
|
|
name=self.make_vm_name("hvm"))
|
|
|
|
self.testvm.create_on_disk(verbose=False)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
|
|
|
|
def pref_set(self, name, value, valid=True):
|
|
|
|
p = subprocess.Popen(
|
|
|
|
['qvm-prefs', '-s', '--', self.testvm.name, name, value],
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=subprocess.PIPE,
|
|
|
|
)
|
|
|
|
(stdout, stderr) = p.communicate()
|
|
|
|
if valid:
|
|
|
|
self.assertEquals(p.returncode, 0,
|
|
|
|
"qvm-prefs -s .. '{}' '{}' failed: {}{}".format(
|
|
|
|
name, value, stdout, stderr
|
|
|
|
))
|
|
|
|
else:
|
|
|
|
self.assertNotEquals(p.returncode, 0,
|
|
|
|
"qvm-prefs should reject value '{}' for "
|
|
|
|
"property '{}'".format(value, name))
|
|
|
|
|
|
|
|
def pref_get(self, name):
|
|
|
|
p = subprocess.Popen(['qvm-prefs', '-g', self.testvm.name, name],
|
|
|
|
stdout=subprocess.PIPE)
|
|
|
|
(stdout, _) = p.communicate()
|
|
|
|
self.assertEquals(p.returncode, 0)
|
|
|
|
return stdout.strip()
|
|
|
|
|
|
|
|
bool_test_values = [
|
|
|
|
('true', 'True', True),
|
|
|
|
('False', 'False', True),
|
|
|
|
('0', 'False', True),
|
|
|
|
('1', 'True', True),
|
|
|
|
('invalid', '', False)
|
|
|
|
]
|
|
|
|
|
|
|
|
def execute_tests(self, name, values):
|
|
|
|
"""
|
|
|
|
Helper function, which executes tests for given property.
|
|
|
|
:param values: list of tuples (value, expected, valid),
|
|
|
|
where 'value' is what should be set and 'expected' is what should
|
|
|
|
qvm-prefs returns as a property value and 'valid' marks valid and
|
|
|
|
invalid values - if it's False, qvm-prefs should reject the value
|
|
|
|
:return: None
|
|
|
|
"""
|
|
|
|
for (value, expected, valid) in values:
|
|
|
|
self.pref_set(name, value, valid)
|
|
|
|
if valid:
|
|
|
|
self.assertEquals(self.pref_get(name), expected)
|
|
|
|
|
|
|
|
def test_000_kernel(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
|
|
|
|
default_kernel = self.qc.get_default_kernel()
|
|
|
|
self.execute_tests('kernel', [
|
|
|
|
('default', default_kernel, True),
|
|
|
|
(default_kernel, default_kernel, True),
|
|
|
|
('invalid', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_001_include_in_backups(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('include_in_backups', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_002_qrexec_timeout(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('qrexec_timeout', [
|
|
|
|
('60', '60', True),
|
|
|
|
('0', '0', True),
|
|
|
|
('-10', '', False),
|
|
|
|
('invalid', '', False)
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_003_internal(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('include_in_backups', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_004_label(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('label', [
|
|
|
|
('red', 'red', True),
|
|
|
|
('blue', 'blue', True),
|
|
|
|
('amber', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_005_kernelopts(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('kernelopts', [
|
|
|
|
('option', 'option', True),
|
|
|
|
('default', 'nopat', True),
|
|
|
|
('', '', True),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_006_template(self):
|
|
|
|
templates = [tpl for tpl in self.qc.values() if tpl.is_template()]
|
|
|
|
if not templates:
|
|
|
|
self.skip("No templates installed")
|
|
|
|
some_template = templates[0].name
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('template', [
|
|
|
|
(some_template, some_template, True),
|
|
|
|
('invalid', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_007_memory(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
qh = qubes.qubes.QubesHost()
|
|
|
|
memory_total = qh.memory_total
|
|
|
|
|
|
|
|
self.execute_tests('memory', [
|
|
|
|
('300', '300', True),
|
|
|
|
('1500', '1500', True),
|
|
|
|
# TODO:
|
|
|
|
#('500M', '500', True),
|
|
|
|
#(str(self.testvm.maxmem+500), '', False),
|
|
|
|
(str(2*memory_total), '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_008_maxmem(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
qh = qubes.qubes.QubesHost()
|
|
|
|
memory_total = qh.memory_total
|
|
|
|
|
|
|
|
self.execute_tests('memory', [
|
|
|
|
('300', '300', True),
|
|
|
|
('1500', '1500', True),
|
|
|
|
# TODO:
|
|
|
|
#('500M', '500', True),
|
|
|
|
#(str(self.testvm.memory-50), '', False),
|
|
|
|
(str(2*memory_total), '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_009_autostart(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('autostart', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_010_pci_strictreset(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('pci_strictreset', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_011_dispvm_netvm(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
|
|
|
|
default_netvm = self.qc.get_default_netvm().name
|
|
|
|
netvms = [tpl for tpl in self.qc.values() if tpl.is_netvm()]
|
|
|
|
if not netvms:
|
|
|
|
self.skip("No netvms installed")
|
|
|
|
some_netvm = netvms[0].name
|
|
|
|
if some_netvm == default_netvm:
|
|
|
|
if len(netvms) <= 1:
|
|
|
|
self.skip("At least two NetVM/ProxyVM required")
|
|
|
|
some_netvm = netvms[1].name
|
|
|
|
|
|
|
|
self.execute_tests('dispvm_netvm', [
|
|
|
|
(some_netvm, some_netvm, True),
|
|
|
|
(default_netvm, default_netvm, True),
|
|
|
|
('default', default_netvm, True),
|
|
|
|
('none', '', True),
|
|
|
|
(self.testvm.name, '', False),
|
|
|
|
('invalid', '', False)
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_012_mac(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
default_mac = self.testvm.mac
|
|
|
|
|
|
|
|
self.execute_tests('mac', [
|
|
|
|
('00:11:22:33:44:55', '00:11:22:33:44:55', True),
|
|
|
|
('auto', default_mac, True),
|
|
|
|
# TODO:
|
|
|
|
#('00:11:22:33:44:55:66', '', False),
|
|
|
|
('invalid', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_013_default_user(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('default_user', [
|
|
|
|
('someuser', self.testvm.template.default_user, True)
|
|
|
|
# TODO: tests for standalone VMs
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_014_pcidevs(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('pcidevs', [
|
|
|
|
('[]', '[]', True),
|
|
|
|
('[ "00:00.0" ]', "['00:00.0']", True),
|
|
|
|
('invalid', '', False),
|
|
|
|
('[invalid]', '', False),
|
|
|
|
# TODO:
|
|
|
|
#('["12:12.0"]', '', False)
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_015_name(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('name', [
|
|
|
|
('invalid!@#name', '', False),
|
|
|
|
# TODO: duplicate name test - would fail for now...
|
|
|
|
])
|
|
|
|
newname = self.make_vm_name('newname')
|
|
|
|
self.pref_set('name', newname, True)
|
|
|
|
self.qc.lock_db_for_reading()
|
|
|
|
self.qc.load()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
self.testvm = self.qc.get_vm_by_name(newname)
|
|
|
|
self.assertEquals(self.pref_get('name'), newname)
|
|
|
|
|
|
|
|
def test_016_vcpus(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('vcpus', [
|
|
|
|
('1', '1', True),
|
|
|
|
('100', '', False),
|
|
|
|
('-1', '', False),
|
|
|
|
('invalid', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_017_debug(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('debug', [
|
|
|
|
('on', 'True', True),
|
|
|
|
('off', 'False', True),
|
|
|
|
('true', 'True', True),
|
|
|
|
('0', 'False', True),
|
|
|
|
('invalid', '', False)
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_018_netvm(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
|
|
|
|
default_netvm = self.qc.get_default_netvm().name
|
|
|
|
netvms = [tpl for tpl in self.qc.values() if tpl.is_netvm()]
|
|
|
|
if not netvms:
|
|
|
|
self.skip("No netvms installed")
|
|
|
|
some_netvm = netvms[0].name
|
|
|
|
if some_netvm == default_netvm:
|
|
|
|
if len(netvms) <= 1:
|
|
|
|
self.skip("At least two NetVM/ProxyVM required")
|
|
|
|
some_netvm = netvms[1].name
|
|
|
|
|
|
|
|
self.execute_tests('netvm', [
|
|
|
|
(some_netvm, some_netvm, True),
|
|
|
|
(default_netvm, default_netvm, True),
|
|
|
|
('default', default_netvm, True),
|
|
|
|
('none', '', True),
|
|
|
|
(self.testvm.name, '', False),
|
|
|
|
('invalid', '', False)
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_019_guiagent_installed(self):
|
|
|
|
self.setup_hvm()
|
|
|
|
self.execute_tests('guiagent_installed', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_020_qrexec_installed(self):
|
|
|
|
self.setup_hvm()
|
|
|
|
self.execute_tests('qrexec_installed', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_021_seamless_gui_mode(self):
|
|
|
|
self.setup_hvm()
|
|
|
|
# should reject seamless mode without gui agent
|
|
|
|
self.execute_tests('seamless_gui_mode', [
|
|
|
|
('True', '', False),
|
|
|
|
('False', 'False', True),
|
|
|
|
])
|
|
|
|
self.execute_tests('guiagent_installed', [('True', 'True', True)])
|
|
|
|
self.execute_tests('seamless_gui_mode', self.bool_test_values)
|
|
|
|
|
|
|
|
def test_022_drive(self):
|
|
|
|
self.setup_hvm()
|
|
|
|
self.execute_tests('drive', [
|
|
|
|
('hd:dom0:/tmp/drive.img', 'hd:dom0:/tmp/drive.img', True),
|
|
|
|
('hd:/tmp/drive.img', 'hd:dom0:/tmp/drive.img', True),
|
|
|
|
('cdrom:dom0:/tmp/drive.img', 'cdrom:dom0:/tmp/drive.img', True),
|
|
|
|
('cdrom:/tmp/drive.img', 'cdrom:dom0:/tmp/drive.img', True),
|
|
|
|
('/tmp/drive.img', 'cdrom:dom0:/tmp/drive.img', True),
|
|
|
|
('hd:drive.img', '', False),
|
|
|
|
('drive.img', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_023_timezone(self):
|
|
|
|
self.setup_hvm()
|
|
|
|
self.execute_tests('timezone', [
|
|
|
|
('localtime', 'localtime', True),
|
|
|
|
('0', '0', True),
|
|
|
|
('3600', '3600', True),
|
|
|
|
('-7200', '-7200', True),
|
|
|
|
('invalid', '', False),
|
|
|
|
])
|
|
|
|
|
|
|
|
def test_024_pv_reject_hvm_props(self):
|
|
|
|
self.setup_appvm()
|
|
|
|
self.execute_tests('guiagent_installed', [('False', '', False)])
|
|
|
|
self.execute_tests('qrexec_installed', [('False', '', False)])
|
|
|
|
self.execute_tests('drive', [('/tmp/drive.img', '', False)])
|
|
|
|
self.execute_tests('timezone', [('localtime', '', False)])
|
|
|
|
|
|
|
|
def test_025_hvm_reject_pv_props(self):
|
|
|
|
self.setup_hvm()
|
|
|
|
self.execute_tests('kernel', [('default', '', False)])
|
|
|
|
self.execute_tests('kernelopts', [('default', '', False)])
|
|
|
|
|
2016-01-06 03:47:08 +01:00
|
|
|
class TC_03_QvmRevertTemplateChanges(qubes.tests.SystemTestsMixin,
|
|
|
|
qubes.tests.QubesTestCase):
|
|
|
|
|
|
|
|
def setup_pv_template(self):
|
|
|
|
self.test_template = self.qc.add_new_vm(
|
|
|
|
"QubesTemplateVm",
|
|
|
|
name=self.make_vm_name("pv-clone"),
|
|
|
|
)
|
|
|
|
self.test_template.clone_attrs(src_vm=self.qc.get_default_template())
|
|
|
|
self.test_template.clone_disk_files(
|
|
|
|
src_vm=self.qc.get_default_template(),
|
|
|
|
verbose=False)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
|
|
|
|
def setup_hvm_template(self):
|
|
|
|
self.test_template = self.qc.add_new_vm(
|
|
|
|
"QubesTemplateHVm",
|
|
|
|
name=self.make_vm_name("hvm"),
|
|
|
|
)
|
|
|
|
self.test_template.create_on_disk(verbose=False)
|
|
|
|
self.save_and_reload_db()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
|
|
|
|
def get_rootimg_checksum(self):
|
|
|
|
p = subprocess.Popen(['sha1sum', self.test_template.root_img],
|
|
|
|
stdout=subprocess.PIPE)
|
|
|
|
return p.communicate()[0]
|
|
|
|
|
|
|
|
def _do_test(self):
|
|
|
|
checksum_before = self.get_rootimg_checksum()
|
|
|
|
self.test_template.start(verbose=False)
|
|
|
|
self.shutdown_and_wait(self.test_template)
|
|
|
|
checksum_changed = self.get_rootimg_checksum()
|
|
|
|
if checksum_before == checksum_changed:
|
|
|
|
self.log.warning("template not modified, test result will be "
|
|
|
|
"unreliable")
|
|
|
|
with self.assertNotRaises(subprocess.CalledProcessError):
|
|
|
|
subprocess.check_call(['sudo', 'qvm-revert-template-changes',
|
|
|
|
'--force', self.test_template.name])
|
|
|
|
|
|
|
|
checksum_after = self.get_rootimg_checksum()
|
|
|
|
self.assertEquals(checksum_before, checksum_after)
|
|
|
|
|
|
|
|
def test_000_revert_pv(self):
|
|
|
|
"""
|
|
|
|
Test qvm-revert-template-changes for PV template
|
|
|
|
"""
|
|
|
|
self.setup_pv_template()
|
|
|
|
self._do_test()
|
|
|
|
|
|
|
|
def test_000_revert_hvm(self):
|
|
|
|
"""
|
|
|
|
Test qvm-revert-template-changes for HVM template
|
|
|
|
"""
|
|
|
|
# TODO: have some system there, so the root.img will get modified
|
|
|
|
self.setup_hvm_template()
|
|
|
|
self._do_test()
|
|
|
|
|
2016-01-14 01:14:41 +01:00
|
|
|
class TC_04_DispVM(qubes.tests.SystemTestsMixin,
|
|
|
|
qubes.tests.QubesTestCase):
|
|
|
|
|
2016-01-18 02:09:17 +01:00
|
|
|
@staticmethod
|
|
|
|
def get_dispvm_template_name():
|
|
|
|
vmdir = os.readlink('/var/lib/qubes/dvmdata/vmdir')
|
|
|
|
return os.path.basename(vmdir)
|
|
|
|
|
2016-01-14 01:14:41 +01:00
|
|
|
def test_000_firewall_propagation(self):
|
2016-01-18 02:09:17 +01:00
|
|
|
"""
|
|
|
|
Check firewall propagation VM->DispVM, when VM have some firewall rules
|
|
|
|
"""
|
|
|
|
|
|
|
|
# FIXME: currently qubes.xml doesn't contain this information...
|
|
|
|
dispvm_template_name = self.get_dispvm_template_name()
|
|
|
|
dispvm_template = self.qc.get_vm_by_name(dispvm_template_name)
|
|
|
|
|
2016-01-14 01:14:41 +01:00
|
|
|
testvm1 = self.qc.add_new_vm("QubesAppVm",
|
|
|
|
name=self.make_vm_name('vm1'),
|
|
|
|
template=self.qc.get_default_template())
|
|
|
|
testvm1.create_on_disk(verbose=False)
|
|
|
|
firewall = testvm1.get_firewall_conf()
|
|
|
|
firewall['allowDns'] = False
|
|
|
|
firewall['allowYumProxy'] = False
|
|
|
|
firewall['rules'] = [{'address': '1.2.3.4',
|
|
|
|
'netmask': 24,
|
|
|
|
'proto': 'tcp',
|
|
|
|
'portBegin': 22,
|
|
|
|
'portEnd': 22,
|
|
|
|
}]
|
|
|
|
testvm1.write_firewall_conf(firewall)
|
|
|
|
self.qc.save()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
|
|
|
|
testvm1.start()
|
|
|
|
|
|
|
|
p = testvm1.run("qvm-run --dispvm 'qubesdb-read /name; echo ERROR;"
|
|
|
|
" read x'",
|
|
|
|
passio_popen=True)
|
|
|
|
|
|
|
|
dispvm_name = p.stdout.readline().strip()
|
|
|
|
self.qc.lock_db_for_reading()
|
|
|
|
self.qc.load()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
dispvm = self.qc.get_vm_by_name(dispvm_name)
|
|
|
|
self.assertIsNotNone(dispvm, "DispVM {} not found in qubes.xml".format(
|
|
|
|
dispvm_name))
|
|
|
|
# check if firewall was propagated to the DispVM
|
|
|
|
self.assertEquals(testvm1.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
# and only there (#1608)
|
|
|
|
self.assertNotEquals(dispvm_template.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
# then modify some rule
|
|
|
|
firewall = dispvm.get_firewall_conf()
|
|
|
|
firewall['rules'] = [{'address': '4.3.2.1',
|
|
|
|
'netmask': 24,
|
|
|
|
'proto': 'tcp',
|
|
|
|
'portBegin': 22,
|
|
|
|
'portEnd': 22,
|
|
|
|
}]
|
|
|
|
dispvm.write_firewall_conf(firewall)
|
|
|
|
# and check again if wasn't saved anywhere else (#1608)
|
|
|
|
self.assertNotEquals(dispvm_template.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
self.assertNotEquals(testvm1.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
p.stdin.write('\n')
|
|
|
|
p.wait()
|
|
|
|
|
2016-01-18 02:09:17 +01:00
|
|
|
def test_001_firewall_propagation(self):
|
|
|
|
"""
|
|
|
|
Check firewall propagation VM->DispVM, when VM have no firewall rules
|
|
|
|
"""
|
|
|
|
testvm1 = self.qc.add_new_vm("QubesAppVm",
|
|
|
|
name=self.make_vm_name('vm1'),
|
|
|
|
template=self.qc.get_default_template())
|
|
|
|
testvm1.create_on_disk(verbose=False)
|
|
|
|
self.qc.save()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
|
|
|
|
# FIXME: currently qubes.xml doesn't contain this information...
|
|
|
|
dispvm_template_name = self.get_dispvm_template_name()
|
|
|
|
dispvm_template = self.qc.get_vm_by_name(dispvm_template_name)
|
|
|
|
original_firewall = None
|
|
|
|
if os.path.exists(dispvm_template.firewall_conf):
|
|
|
|
original_firewall = tempfile.TemporaryFile()
|
|
|
|
with open(dispvm_template.firewall_conf) as f:
|
|
|
|
original_firewall.write(f.read())
|
|
|
|
try:
|
|
|
|
|
|
|
|
firewall = dispvm_template.get_firewall_conf()
|
|
|
|
firewall['allowDns'] = False
|
|
|
|
firewall['allowYumProxy'] = False
|
|
|
|
firewall['rules'] = [{'address': '1.2.3.4',
|
|
|
|
'netmask': 24,
|
|
|
|
'proto': 'tcp',
|
|
|
|
'portBegin': 22,
|
|
|
|
'portEnd': 22,
|
|
|
|
}]
|
|
|
|
dispvm_template.write_firewall_conf(firewall)
|
|
|
|
|
|
|
|
testvm1.start()
|
|
|
|
|
|
|
|
p = testvm1.run("qvm-run --dispvm 'qubesdb-read /name; echo ERROR;"
|
|
|
|
" read x'",
|
|
|
|
passio_popen=True)
|
|
|
|
|
|
|
|
dispvm_name = p.stdout.readline().strip()
|
|
|
|
self.qc.lock_db_for_reading()
|
|
|
|
self.qc.load()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
dispvm = self.qc.get_vm_by_name(dispvm_name)
|
|
|
|
self.assertIsNotNone(dispvm, "DispVM {} not found in qubes.xml".format(
|
|
|
|
dispvm_name))
|
|
|
|
# check if firewall was propagated to the DispVM from the right VM
|
|
|
|
self.assertEquals(testvm1.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
# and only there (#1608)
|
|
|
|
self.assertNotEquals(dispvm_template.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
# then modify some rule
|
|
|
|
firewall = dispvm.get_firewall_conf()
|
|
|
|
firewall['rules'] = [{'address': '4.3.2.1',
|
|
|
|
'netmask': 24,
|
|
|
|
'proto': 'tcp',
|
|
|
|
'portBegin': 22,
|
|
|
|
'portEnd': 22,
|
|
|
|
}]
|
|
|
|
dispvm.write_firewall_conf(firewall)
|
|
|
|
# and check again if wasn't saved anywhere else (#1608)
|
|
|
|
self.assertNotEquals(dispvm_template.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
self.assertNotEquals(testvm1.get_firewall_conf(),
|
|
|
|
dispvm.get_firewall_conf())
|
|
|
|
p.stdin.write('\n')
|
|
|
|
p.wait()
|
|
|
|
finally:
|
|
|
|
if original_firewall:
|
|
|
|
original_firewall.seek(0)
|
|
|
|
with open(dispvm_template.firewall_conf, 'w') as f:
|
|
|
|
f.write(original_firewall.read())
|
|
|
|
original_firewall.close()
|
|
|
|
else:
|
|
|
|
os.unlink(dispvm_template.firewall_conf)
|
|
|
|
|
2016-01-20 02:48:46 +01:00
|
|
|
def test_002_cleanup(self):
|
|
|
|
self.qc.unlock_db()
|
|
|
|
p = subprocess.Popen(['/usr/lib/qubes/qfile-daemon-dvm',
|
|
|
|
'qubes.VMShell', 'dom0', 'DEFAULT'],
|
|
|
|
stdin=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=open(os.devnull, 'w'))
|
|
|
|
(stdout, _) = p.communicate(input="echo test; qubesdb-read /name; "
|
|
|
|
"echo ERROR\n")
|
|
|
|
self.assertEquals(p.returncode, 0)
|
|
|
|
lines = stdout.splitlines()
|
|
|
|
self.assertEqual(lines[0], "test")
|
|
|
|
dispvm_name = lines[1]
|
|
|
|
self.qc.lock_db_for_reading()
|
|
|
|
self.qc.load()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
dispvm = self.qc.get_vm_by_name(dispvm_name)
|
|
|
|
self.assertIsNone(dispvm, "DispVM {} still exists in qubes.xml".format(
|
|
|
|
dispvm_name))
|
|
|
|
|
|
|
|
def test_003_cleanup_destroyed(self):
|
|
|
|
"""
|
|
|
|
Check if DispVM is properly removed even if it terminated itself (#1660)
|
|
|
|
:return:
|
|
|
|
"""
|
|
|
|
self.qc.unlock_db()
|
|
|
|
p = subprocess.Popen(['/usr/lib/qubes/qfile-daemon-dvm',
|
|
|
|
'qubes.VMShell', 'dom0', 'DEFAULT'],
|
|
|
|
stdin=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=open(os.devnull, 'w'))
|
|
|
|
p.stdin.write("qubesdb-read /name\n")
|
|
|
|
p.stdin.write("echo ERROR\n")
|
|
|
|
p.stdin.write("poweroff\n")
|
|
|
|
# do not close p.stdin on purpose - wait to automatic disconnect when
|
|
|
|
# domain is destroyed
|
|
|
|
timeout = 30
|
|
|
|
while timeout > 0:
|
|
|
|
if p.poll():
|
|
|
|
break
|
|
|
|
time.sleep(1)
|
|
|
|
timeout -= 1
|
|
|
|
# includes check for None - timeout
|
|
|
|
self.assertEquals(p.returncode, 0)
|
|
|
|
lines = p.stdout.read().splitlines()
|
|
|
|
dispvm_name = lines[0]
|
|
|
|
self.assertNotEquals(dispvm_name, "ERROR")
|
|
|
|
self.qc.lock_db_for_reading()
|
|
|
|
self.qc.load()
|
|
|
|
self.qc.unlock_db()
|
|
|
|
dispvm = self.qc.get_vm_by_name(dispvm_name)
|
|
|
|
self.assertIsNone(dispvm, "DispVM {} still exists in qubes.xml".format(
|
|
|
|
dispvm_name))
|
|
|
|
|
|
|
|
|
2015-10-05 05:46:07 +02:00
|
|
|
|
2015-02-05 15:46:40 +01:00
|
|
|
# vim: ts=4 sw=4 et
|