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

tests: more tests fixes

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-25 14:20:20 +02:00
parent 214c646417
commit 1af7034d57
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/tests/init.py
View File

@ -229,12 +229,10 @@ class TC_20_PropertyHolder(qubes.tests.QubesTestCase):
self.assertIs(self.holder.property_get_def(TestHolder.testprop1),
TestHolder.testprop1)
@unittest.expectedFailure
def test_002_load_properties(self):
self.holder.load_properties()
self.assertEventFired(self.holder, 'property-loaded')
self.assertEventNotFired(self.holder, 'property-set:testprop1')
self.assertEventFired(self.holder, 'property-set:testprop1')
self.assertEqual(self.holder.testprop1, 'testvalue1')
self.assertEqual(self.holder.testprop2, 'testref2')

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

@ -127,7 +127,6 @@ class TC_01_Properties(qubes.tests.SystemTestCase):
testvm1.label = 'orange'
testvm1.memory = 512
firewall = testvm1.firewall
firewall.policy = 'drop'
firewall.rules = [
qubes.firewall.Rule(None, action='accept', dsthost='1.2.3.0/24',
proto='tcp', dstports=22)]
@ -455,20 +454,20 @@ class TC_05_StandaloneVM(qubes.tests.SystemTestCase):
super(TC_05_StandaloneVM, self).setUp()
self.init_default_template()
@unittest.expectedFailure
def test_000_create_start(self):
testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM,
name=self.make_vm_name('vm1'), label='red')
testvm1.features['qrexec'] = True
self.loop.run_until_complete(
testvm1.clone_disk_files(self.app.default_template))
self.app.save()
self.loop.run_until_complete(testvm1.start())
self.assertEqual(testvm1.get_power_state(), "Running")
@unittest.expectedFailure
def test_100_resize_root_img(self):
testvm1 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM,
name=self.make_vm_name('vm1'), label='red')
testvm1.features['qrexec'] = True
self.loop.run_until_complete(
testvm1.clone_disk_files(self.app.default_template))
self.app.save()