remove cmd.Env set
Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
parent
d26f83c460
commit
33f733026b
|
|
@ -66,8 +66,6 @@ func (c *Context) Exec(command string, args []interface{}, inputs ...string) (st
|
||||||
|
|
||||||
cmd := exec.Command(command, strArgs...)
|
cmd := exec.Command(command, strArgs...)
|
||||||
cmd.Dir = c.basePath
|
cmd.Dir = c.basePath
|
||||||
// inherit the environment variables from the parent process
|
|
||||||
cmd.Env = os.Environ()
|
|
||||||
|
|
||||||
g := errgroup.Group{}
|
g := errgroup.Group{}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -263,17 +263,7 @@ func TestExec(t *testing.T) {
|
||||||
require.Nilf(t, err, "Expected no error to be returned when executing command")
|
require.Nilf(t, err, "Expected no error to be returned when executing command")
|
||||||
require.Equalf(t, expected, output, "Expected %s to be returned when executing command", expected)
|
require.Equalf(t, expected, output, "Expected %s to be returned when executing command", expected)
|
||||||
|
|
||||||
// test inherited environment
|
|
||||||
expected = "bar\n"
|
|
||||||
os.Setenv("HELMFILE_TEST", "bar")
|
|
||||||
defer os.Unsetenv("HELMFILE_TEST")
|
|
||||||
output, err = ctx.Exec("bash", []interface{}{"-c", "echo $HELMFILE_TEST"}, "")
|
|
||||||
require.Nilf(t, err, "Expected no error to be returned when executing command")
|
|
||||||
require.Equalf(t, expected, output, "Expected %s to be returned when executing command", expected)
|
|
||||||
|
|
||||||
// test that the command is executed with no-zero exit code
|
// test that the command is executed with no-zero exit code
|
||||||
|
|
||||||
_, err = ctx.Exec("bash", []interface{}{"-c", "exit 1"}, "")
|
_, err = ctx.Exec("bash", []interface{}{"-c", "exit 1"}, "")
|
||||||
require.Error(t, err, "Expected error to be returned when executing command with non-zero exit code")
|
require.Error(t, err, "Expected error to be returned when executing command with non-zero exit code")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue