Fix shell command execution
Change-Id: I42248e3c355c8ea6218d7c9d989a3ad5ad42c57d
This commit is contained in:
@@ -131,11 +131,11 @@ class ShellProcessFixture(tobiko.SharedFixture):
|
|||||||
sudo = self.parameters.sudo
|
sudo = self.parameters.sudo
|
||||||
|
|
||||||
shell = self.parameters.shell
|
shell = self.parameters.shell
|
||||||
|
if shell in [True, None]:
|
||||||
|
shell = default_shell_command()
|
||||||
|
|
||||||
if shell:
|
if shell:
|
||||||
if shell is True:
|
shell = _command.shell_command(shell)
|
||||||
shell = default_shell_command()
|
|
||||||
else:
|
|
||||||
shell = _command.shell_command(shell)
|
|
||||||
command = shell + [str(command)]
|
command = shell + [str(command)]
|
||||||
else:
|
else:
|
||||||
command = _command.shell_command(command)
|
command = _command.shell_command(command)
|
||||||
@@ -478,7 +478,7 @@ def str_from_stream(stream):
|
|||||||
def default_shell_command():
|
def default_shell_command():
|
||||||
from tobiko import config
|
from tobiko import config
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
return _command.shell_command(CONF.tobiko.shell.sudo)
|
return _command.shell_command(CONF.tobiko.shell.command)
|
||||||
|
|
||||||
|
|
||||||
def default_sudo_command():
|
def default_sudo_command():
|
||||||
|
|||||||
Reference in New Issue
Block a user