From 4384b93c19c81eb8a3b0540ebfe1bbb4dc8e211c Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 5 Mar 2016 11:00:07 +0200 Subject: [PATCH] main: remove unneeded use_shell parameter --- trezor_agent/__main__.py | 4 +--- trezor_agent/server.py | 4 ++-- trezor_agent/tests/test_server.py | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/trezor_agent/__main__.py b/trezor_agent/__main__.py index acc90bb..0675448 100644 --- a/trezor_agent/__main__.py +++ b/trezor_agent/__main__.py @@ -131,9 +131,7 @@ def run_agent(client_factory): handler = protocol.Handler(keys=public_keys, signer=signer, debug=args.debug) with server.serve(handler=handler, timeout=args.timeout) as env: - return server.run_process(command=command, - environ=env, - use_shell=use_shell) + return server.run_process(command=command, environ=env) except KeyboardInterrupt: log.info('server stopped') diff --git a/trezor_agent/server.py b/trezor_agent/server.py index 2b299da..5680614 100644 --- a/trezor_agent/server.py +++ b/trezor_agent/server.py @@ -131,7 +131,7 @@ def serve(handler, sock_path=None, timeout=UNIX_SOCKET_TIMEOUT): quit_event.set() -def run_process(command, environ, use_shell=False): +def run_process(command, environ): """ Run the specified process and wait until it finishes. @@ -141,7 +141,7 @@ def run_process(command, environ, use_shell=False): env = dict(os.environ) env.update(environ) try: - p = subprocess.Popen(args=command, env=env, shell=use_shell) + p = subprocess.Popen(args=command, env=env) except OSError as e: raise OSError('cannot run %r: %s' % (command, e)) log.debug('subprocess %d is running', p.pid) diff --git a/trezor_agent/tests/test_server.py b/trezor_agent/tests/test_server.py index 8f1b63d..578dc1d 100644 --- a/trezor_agent/tests/test_server.py +++ b/trezor_agent/tests/test_server.py @@ -91,10 +91,8 @@ def test_spawn(): def test_run(): assert server.run_process(['true'], environ={}) == 0 assert server.run_process(['false'], environ={}) == 1 - assert server.run_process( - command='exit $X', - environ={'X': '42'}, - use_shell=True) == 42 + assert server.run_process(command=['bash', '-c', 'exit $X'], + environ={'X': '42'}) == 42 with pytest.raises(OSError): server.run_process([''], environ={})