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

tests: minor fixes in int.tools tests

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-10 17:46:21 +01:00 committed by Wojtek Porczyk
parent 163ab25d4b
commit 05d006b873
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/tests/int/tools/qubes_create.py
View File

@ -32,13 +32,13 @@ import qubes.tests
class TC_00_qubes_create( class TC_00_qubes_create(
qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase): qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
def test_000_basic(self): def test_000_basic(self):
self.assertEqual(0, qubes.tools.qubes_create.main(( self.assertEqual(0, qubes.tools.qubes_create.main([
'--qubesxml', qubes.tests.XMLPATH))) '--qubesxml', qubes.tests.XMLPATH]))
def test_001_property(self): def test_001_property(self):
self.assertEqual(0, qubes.tools.qubes_create.main(( self.assertEqual(0, qubes.tools.qubes_create.main([
'--qubesxml', qubes.tests.XMLPATH, '--qubesxml', qubes.tests.XMLPATH,
'--property', 'default_kernel=testkernel'))) '--property', 'default_kernel=testkernel']))
self.assertEqual('testkernel', self.assertEqual('testkernel',
qubes.Qubes(qubes.tests.XMLPATH).default_kernel) qubes.Qubes(qubes.tests.XMLPATH).default_kernel)

10
qubes/tests/int/tools/qvm_run.py
View File

@ -40,17 +40,11 @@ import qubes.tests
class TC_00_qvm_run(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase): class TC_00_qvm_run(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
def setUp(self): def setUp(self):
super(TC_00_qvm_run, self).setUp() super(TC_00_qvm_run, self).setUp()
self.app = qubes.Qubes.create_empty_store(qubes.tests.XMLPATH, self.init_default_template()
default_kernel=os.listdir(os.path.join(
qubes.config.system_path['qubes_base_dir'],
qubes.config.system_path['qubes_kernels_base_dir']))[0])
self.app.add_new_vm(qubes.vm.templatevm.TemplateVM,
name=qubes.tests.TEMPLATE,
label='black')
self.vm1 = self.app.add_new_vm(qubes.vm.appvm.AppVM, self.vm1 = self.app.add_new_vm(qubes.vm.appvm.AppVM,
name=self.make_vm_name('vm1'), name=self.make_vm_name('vm1'),
template=qubes.tests.TEMPLATE, template=self.app.default_template,
label='red') label='red')
self.vm1.create_on_disk() self.vm1.create_on_disk()