Revert "Fix shell command execution"
This causes a shell execution loop and errors out This reverts commit 075e78770ddc1acc143f4ff00e929cf2021e019a. Change-Id: I261abef9f93e96026b92e04b92f55db67bfb5780
This commit is contained in:
parent
c745a900ed
commit
7c156ff7fc
@ -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:
|
||||
shell = _command.shell_command(shell)
|
||||
if shell is True:
|
||||
shell = default_shell_command()
|
||||
else:
|
||||
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.command)
|
||||
return _command.shell_command(CONF.tobiko.shell.sudo)
|
||||
|
||||
|
||||
def default_sudo_command():
|
||||
|
Loading…
x
Reference in New Issue
Block a user