x
/
tobiko
Code Issues Proposed changes

Merge "Fix shell command execution"

This commit is contained in:
Zuul 2020-02-21 10:33:31 +00:00 committed by Gerrit Code Review
parent 56bca2c97a 075e78770d
commit 1fc92a0186
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tobiko/shell/sh/_process.py
View File

@ -131,11 +131,11 @@ class ShellProcessFixture(tobiko.SharedFixture):
sudo = self.parameters.sudo
shell = self.parameters.shell
if shell in [True, None]:
shell = default_shell_command()
if shell:
if shell is True:
shell = default_shell_command()
else:
shell = _command.shell_command(shell)
shell = _command.shell_command(shell)
command = shell + [str(command)]
else:
command = _command.shell_command(command)
@ -478,7 +478,7 @@ def str_from_stream(stream):
def default_shell_command():
from tobiko import config
CONF = config.CONF
return _command.shell_command(CONF.tobiko.shell.sudo)
return _command.shell_command(CONF.tobiko.shell.command)
def default_sudo_command():