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

qvm-start-daemon: convert to async/await syntax

Browse Source
This commit is contained in:
Paweł Marczewski 2020-07-29 10:00:20 +02:00
parent 60d28dc13a
commit cb7f191bd2
No known key found for this signature in database
GPG Key ID: DE42EE9B14F96465
3 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/requirements.txt
View File

@ -9,3 +9,4 @@ mock
lxml lxml
PyYAML PyYAML
xcffib xcffib
asynctest

13
qubesadmin/tests/tools/qvm_start_daemon.py
View File

@ -23,9 +23,10 @@ import signal
import tempfile import tempfile
import unittest.mock import unittest.mock
import re import re
import asyncio import asyncio
import asynctest
import qubesadmin.tests import qubesadmin.tests
import qubesadmin.tools.qvm_start_daemon import qubesadmin.tools.qvm_start_daemon
from qubesadmin.tools.qvm_start_daemon import GUI_DAEMON_OPTIONS from qubesadmin.tools.qvm_start_daemon import GUI_DAEMON_OPTIONS
@ -207,7 +208,7 @@ global: {
} }
''') ''')
@unittest.mock.patch('asyncio.create_subprocess_exec') @asynctest.patch('asyncio.create_subprocess_exec')
def test_020_start_gui_for_vm(self, proc_mock): def test_020_start_gui_for_vm(self, proc_mock):
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
@ -238,7 +239,7 @@ global: {
self.assertAllCalled() self.assertAllCalled()
@unittest.mock.patch('asyncio.create_subprocess_exec') @asynctest.patch('asyncio.create_subprocess_exec')
def test_021_start_gui_for_vm_hvm(self, proc_mock): def test_021_start_gui_for_vm_hvm(self, proc_mock):
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
@ -307,7 +308,7 @@ global: {
pidfile.flush() pidfile.flush()
self.addCleanup(pidfile.close) self.addCleanup(pidfile.close)
patch_proc = unittest.mock.patch('asyncio.create_subprocess_exec') patch_proc = asynctest.patch('asyncio.create_subprocess_exec')
patch_args = unittest.mock.patch.object(self.launcher, patch_args = unittest.mock.patch.object(self.launcher,
'common_guid_args', 'common_guid_args',
lambda vm: []) lambda vm: [])
@ -350,7 +351,7 @@ global: {
None)] = \ None)] = \
b'2\x00QubesFeatureNotFoundError\x00\x00Feature not set\x00' b'2\x00QubesFeatureNotFoundError\x00\x00Feature not set\x00'
proc_mock = unittest.mock.Mock() proc_mock = unittest.mock.Mock()
with unittest.mock.patch('asyncio.create_subprocess_exec', with asynctest.patch('asyncio.create_subprocess_exec',
lambda *args: self.mock_coroutine(proc_mock, lambda *args: self.mock_coroutine(proc_mock,
*args)): *args)):
with unittest.mock.patch.object(self.launcher, with unittest.mock.patch.object(self.launcher,
@ -384,7 +385,7 @@ global: {
None)] = \ None)] = \
b'0\x001' b'0\x001'
proc_mock = unittest.mock.Mock() proc_mock = unittest.mock.Mock()
with unittest.mock.patch('asyncio.create_subprocess_exec', with asynctest.patch('asyncio.create_subprocess_exec',
lambda *args: self.mock_coroutine(proc_mock, lambda *args: self.mock_coroutine(proc_mock,
*args)): *args)):
with unittest.mock.patch.object(self.launcher, with unittest.mock.patch.object(self.launcher,

46
qubesadmin/tools/qvm_start_daemon.py
View File

@ -32,20 +32,12 @@ import xcffib.xproto # pylint: disable=unused-import
import daemon.pidfile import daemon.pidfile
import qubesadmin import qubesadmin
import qubesadmin.events
import qubesadmin.exc import qubesadmin.exc
import qubesadmin.tools import qubesadmin.tools
import qubesadmin.vm import qubesadmin.vm
from . import xcffibhelpers from . import xcffibhelpers
have_events = False
try:
# pylint: disable=wrong-import-position
import qubesadmin.events
have_events = True
except ImportError:
pass
GUI_DAEMON_PATH = '/usr/bin/qubes-guid' GUI_DAEMON_PATH = '/usr/bin/qubes-guid'
PACAT_DAEMON_PATH = '/usr/bin/pacat-simple-vchan' PACAT_DAEMON_PATH = '/usr/bin/pacat-simple-vchan'
QUBES_ICON_DIR = '/usr/share/icons/hicolor/128x128/devices' QUBES_ICON_DIR = '/usr/share/icons/hicolor/128x128/devices'
@ -331,8 +323,7 @@ class DAEMONLauncher:
self.started_processes = {} self.started_processes = {}
self.kde = False self.kde = False
@asyncio.coroutine async def send_monitor_layout(self, vm, layout=None, startup=False):
def send_monitor_layout(self, vm, layout=None, startup=False):
"""Send monitor layout to a given VM """Send monitor layout to a given VM
This function is a coroutine. This function is a coroutine.
@ -367,7 +358,7 @@ class DAEMONLauncher:
pass pass
try: try:
yield from asyncio.get_event_loop(). \ await asyncio.get_event_loop(). \
run_in_executor(None, run_in_executor(None,
functools.partial( functools.partial(
vm.run_service_for_stdio, vm.run_service_for_stdio,
@ -476,8 +467,7 @@ class DAEMONLauncher:
else vm.xid else vm.xid
return xid return xid
@asyncio.coroutine async def start_gui_for_vm(self, vm, monitor_layout=None):
def start_gui_for_vm(self, vm, monitor_layout=None):
"""Start GUI daemon (qubes-guid) connected directly to a VM """Start GUI daemon (qubes-guid) connected directly to a VM
This function is a coroutine. This function is a coroutine.
@ -503,13 +493,12 @@ class DAEMONLauncher:
vm.log.info('Starting GUI') vm.log.info('Starting GUI')
yield from asyncio.create_subprocess_exec(*guid_cmd) await asyncio.create_subprocess_exec(*guid_cmd)
yield from self.send_monitor_layout(vm, layout=monitor_layout, await self.send_monitor_layout(vm, layout=monitor_layout,
startup=True) startup=True)
@asyncio.coroutine async def start_gui_for_stubdomain(self, vm, force=False):
def start_gui_for_stubdomain(self, vm, force=False):
"""Start GUI daemon (qubes-guid) connected to a stubdomain """Start GUI daemon (qubes-guid) connected to a stubdomain
This function is a coroutine. This function is a coroutine.
@ -533,10 +522,9 @@ class DAEMONLauncher:
guid_cmd = self.common_guid_args(vm) guid_cmd = self.common_guid_args(vm)
guid_cmd.extend(['-d', str(vm.stubdom_xid), '-t', str(vm.xid)]) guid_cmd.extend(['-d', str(vm.stubdom_xid), '-t', str(vm.xid)])
yield from asyncio.create_subprocess_exec(*guid_cmd) await asyncio.create_subprocess_exec(*guid_cmd)
@asyncio.coroutine async def start_audio_for_vm(self, vm):
def start_audio_for_vm(self, vm):
"""Start AUDIO daemon (pacat-simple-vchan) connected directly to a VM """Start AUDIO daemon (pacat-simple-vchan) connected directly to a VM
This function is a coroutine. This function is a coroutine.
@ -547,10 +535,9 @@ class DAEMONLauncher:
pacat_cmd = [PACAT_DAEMON_PATH, '-l', self.pacat_domid(vm), vm.name] pacat_cmd = [PACAT_DAEMON_PATH, '-l', self.pacat_domid(vm), vm.name]
vm.log.info('Starting AUDIO') vm.log.info('Starting AUDIO')
yield from asyncio.create_subprocess_exec(*pacat_cmd) await asyncio.create_subprocess_exec(*pacat_cmd)
@asyncio.coroutine async def start_gui(self, vm, force_stubdom=False, monitor_layout=None):
def start_gui(self, vm, force_stubdom=False, monitor_layout=None):
"""Start GUI daemon regardless of start event. """Start GUI daemon regardless of start event.
This function is a coroutine. This function is a coroutine.
@ -566,16 +553,15 @@ class DAEMONLauncher:
return return
if vm.virt_mode == 'hvm': if vm.virt_mode == 'hvm':
yield from self.start_gui_for_stubdomain(vm, force=force_stubdom) await self.start_gui_for_stubdomain(vm, force=force_stubdom)
if not vm.features.check_with_template('gui', True): if not vm.features.check_with_template('gui', True):
return return
if not os.path.exists(self.guid_pidfile(vm.xid)): if not os.path.exists(self.guid_pidfile(vm.xid)):
yield from self.start_gui_for_vm(vm, monitor_layout=monitor_layout) await self.start_gui_for_vm(vm, monitor_layout=monitor_layout)
@asyncio.coroutine async def start_audio(self, vm):
def start_audio(self, vm):
"""Start AUDIO daemon regardless of start event. """Start AUDIO daemon regardless of start event.
This function is a coroutine. This function is a coroutine.
@ -592,7 +578,7 @@ class DAEMONLauncher:
xid = self.pacat_domid(vm) xid = self.pacat_domid(vm)
if not os.path.exists(self.pacat_pidfile(xid)): if not os.path.exists(self.pacat_pidfile(xid)):
yield from self.start_audio_for_vm(vm) await self.start_audio_for_vm(vm)
def on_domain_spawn(self, vm, _event, **kwargs): def on_domain_spawn(self, vm, _event, **kwargs):
"""Handler of 'domain-spawn' event, starts GUI daemon for stubdomain""" """Handler of 'domain-spawn' event, starts GUI daemon for stubdomain"""
@ -718,8 +704,6 @@ def main(args=None):
if args.kde: if args.kde:
launcher.kde = True launcher.kde = True
if args.watch: if args.watch:
if not have_events:
parser.error('--watch option require Python >= 3.5')
with daemon.pidfile.TimeoutPIDLockFile(args.pidfile): with daemon.pidfile.TimeoutPIDLockFile(args.pidfile):
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
# pylint: disable=no-member # pylint: disable=no-member