events: fix calling mgmt.Events from VM

asyncio.create_subprocess_exec expects program and arguments directly, not as a list.
QubesOS · Jun 25, 2017 · ce7d486 · ce7d486
1 parent c545c95
commit ce7d486
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/qubesadmin/events/__init__.py b/qubesadmin/events/__init__.py
@@ -87,7 +87,7 @@ def cleanup_func():
                 writer.close()
         elif self.app.qubesd_connection_type == 'qrexec':
             proc = yield from asyncio.create_subprocess_exec(
-                ['qrexec-client-vm', dest, 'admin.Events'],
+                'qrexec-client-vm', dest, 'admin.Events',
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
 
             proc.stdin.write_eof()

diff --git a/qubesadmin/tests/events.py b/qubesadmin/tests/events.py
@@ -199,8 +199,8 @@ def test_022_get_events_reader_remote(self):
             task = asyncio.ensure_future(self.dispatcher._get_events_reader())
             loop.run_until_complete(task)
             self.assertEqual(mock_proc.mock_calls, [
-                unittest.mock.call(['qrexec-client-vm', 'dom0',
-                    'admin.Events'], stdin=subprocess.PIPE,
+                unittest.mock.call('qrexec-client-vm', 'dom0',
+                    'admin.Events', stdin=subprocess.PIPE,
                     stdout=subprocess.PIPE),
                 unittest.mock.call().stdin.write_eof()
             ])
@@ -224,8 +224,8 @@ def test_023_get_events_reader_remote_vm(self):
             task = asyncio.ensure_future(self.dispatcher._get_events_reader(vm))
             loop.run_until_complete(task)
             self.assertEqual(mock_proc.mock_calls, [
-                unittest.mock.call(['qrexec-client-vm', 'test-vm',
-                    'admin.Events'], stdin=subprocess.PIPE,
+                unittest.mock.call('qrexec-client-vm', 'test-vm',
+                    'admin.Events', stdin=subprocess.PIPE,
                     stdout=subprocess.PIPE),
                 unittest.mock.call().stdin.write_eof()
             ])