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

tests: some more fixes for core3 API

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-23 00:30:35 +01:00
parent 3ecc0a9bcb
commit 13fc810363
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -970,6 +970,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
# now free the fragmented memory and trigger compaction # now free the fragmented memory and trigger compaction
alloc1.stdin.write(b"\n") alloc1.stdin.write(b"\n")
alloc1.stdin.flush()
alloc1.wait() alloc1.wait()
self.testvm1.run("echo 1 > /proc/sys/vm/compact_memory", user="root") self.testvm1.run("echo 1 > /proc/sys/vm/compact_memory", user="root")
@ -1006,9 +1007,11 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
class TC_10_Generic(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase): class TC_10_Generic(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
def setUp(self): def setUp(self):
super(TC_10_Generic, self).setUp() super(TC_10_Generic, self).setUp()
self.init_default_template()
self.vm = self.app.add_new_vm( self.vm = self.app.add_new_vm(
qubes.vm.appvm.AppVM, qubes.vm.appvm.AppVM,
name=self.make_vm_name('vm'), name=self.make_vm_name('vm'),
label='red',
template=self.app.default_template) template=self.app.default_template)
self.vm.create_on_disk() self.vm.create_on_disk()
self.save_and_reload_db() self.save_and_reload_db()
@ -1029,7 +1032,7 @@ class TC_10_Generic(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
f.write('echo service output\n') f.write('echo service output\n')
self.addCleanup(os.unlink, "/etc/qubes-rpc/test.AnyvmDeny") self.addCleanup(os.unlink, "/etc/qubes-rpc/test.AnyvmDeny")
self.vm.start(verbose=False) self.vm.start()
p = self.vm.run("/usr/lib/qubes/qrexec-client-vm dom0 test.AnyvmDeny", p = self.vm.run("/usr/lib/qubes/qrexec-client-vm dom0 test.AnyvmDeny",
passio_popen=True, passio_stderr=True) passio_popen=True, passio_stderr=True)
(stdout, stderr) = p.communicate() (stdout, stderr) = p.communicate()