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

tools/qvm-run: use subproces.DEVNULL instead of manually opened /dev/null

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-17 11:06:56 +02:00
parent f386d45695
commit 210876bd8f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qubesadmin/tests/tools/qvm_run.py
View File

@ -43,15 +43,12 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
# b'0\x00test-vm class=AppVM state=Running\n' # b'0\x00test-vm class=AppVM state=Running\n'
ret = qubesadmin.tools.qvm_run.main(['test-vm', 'command'], app=self.app) ret = qubesadmin.tools.qvm_run.main(['test-vm', 'command'], app=self.app)
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
# make sure we have the same instance below
null = self.app.service_calls[0][2]['stdout']
self.assertIsInstance(null, io.BufferedWriter)
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': True,
'localcmd': None, 'localcmd': None,
'stdout': null, 'stdout': subprocess.DEVNULL,
'stderr': null, 'stderr': subprocess.DEVNULL,
'user': None, 'user': None,
}), }),
('test-vm', 'qubes.VMShell', b'command\n') ('test-vm', 'qubes.VMShell', b'command\n')
@ -69,28 +66,20 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
ret = qubesadmin.tools.qvm_run.main(['test-vm', 'test-vm2', 'command'], ret = qubesadmin.tools.qvm_run.main(['test-vm', 'test-vm2', 'command'],
app=self.app) app=self.app)
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
for i in range(0, len(self.app.service_calls), 2):
self.assertIsInstance(self.app.service_calls[i][2]['stdout'],
io.BufferedWriter)
self.assertIsInstance(self.app.service_calls[i][2]['stderr'],
io.BufferedWriter)
# make sure we have the same instance below
null = self.app.service_calls[0][2]['stdout']
null2 = self.app.service_calls[2][2]['stdout']
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': True,
'localcmd': None, 'localcmd': None,
'stdout': null, 'stdout': subprocess.DEVNULL,
'stderr': null, 'stderr': subprocess.DEVNULL,
'user': None, 'user': None,
}), }),
('test-vm', 'qubes.VMShell', b'command\n'), ('test-vm', 'qubes.VMShell', b'command\n'),
('test-vm2', 'qubes.VMShell', { ('test-vm2', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': True,
'localcmd': None, 'localcmd': None,
'stdout': null2, 'stdout': subprocess.DEVNULL,
'stderr': null2, 'stderr': subprocess.DEVNULL,
'user': None, 'user': None,
}), }),
('test-vm2', 'qubes.VMShell', b'command\n') ('test-vm2', 'qubes.VMShell', b'command\n')

8
qubesadmin/tools/qvm_run.py
View File

@ -27,7 +27,7 @@ import sys
import asyncio import asyncio
import functools import functools
import subprocess
import logging import logging
import qubesadmin.tools import qubesadmin.tools
@ -129,8 +129,8 @@ def main(args=None, app=None):
retcode = 0 retcode = 0
run_kwargs = {} run_kwargs = {}
if not args.passio: if not args.passio:
run_kwargs['stdout'] = open(os.devnull, 'wb') run_kwargs['stdout'] = subprocess.DEVNULL
run_kwargs['stderr'] = run_kwargs['stdout'] run_kwargs['stderr'] = subprocess.DEVNULL
else: else:
# connect process output to stdout/err directly if --pass-io is given # connect process output to stdout/err directly if --pass-io is given
run_kwargs['stdout'] = None run_kwargs['stdout'] = None
@ -184,8 +184,6 @@ def main(args=None, app=None):
if args.color_stderr: if args.color_stderr:
sys.stderr.write('\033[0m') sys.stderr.write('\033[0m')
sys.stderr.flush() sys.stderr.flush()
if run_kwargs['stdout'] is not None:
run_kwargs['stdout'].close()
return retcode return retcode