tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2e: always set HOME + USER for cmd env 

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This commit is contained in:
Milas Bowman 2022-06-16 09:44:26 -04:00
parent 3ae6c52e8a
commit ccd87311e8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/e2e/ddev_test.go
View File

@ -56,8 +56,6 @@ func TestComposeRunDdev(t *testing.T) {
c := NewCLI(t, WithEnv( c := NewCLI(t, WithEnv(
"DDEV_DEBUG=true", "DDEV_DEBUG=true",
fmt.Sprintf("HOME=%s", t.TempDir()),
fmt.Sprintf("USER=%s", os.Getenv("USER")),
fmt.Sprintf("PATH=%s", pathDir), fmt.Sprintf("PATH=%s", pathDir),
)) ))

10
pkg/e2e/framework.go
View File

@ -59,8 +59,15 @@ func init() {
// CLI is used to wrap the CLI for end to end testing // CLI is used to wrap the CLI for end to end testing
type CLI struct { type CLI struct {
// ConfigDir for Docker configuration (set as DOCKER_CONFIG)
ConfigDir string ConfigDir string
// HomeDir for tools that look for user files (set as HOME)
HomeDir string
// env overrides to apply to every invoked command
//
// To populate, use WithEnv when creating a CLI instance.
env []string env []string
} }
@ -84,6 +91,7 @@ func NewCLI(t testing.TB, opts ...CLIOption) *CLI {
c := &CLI{ c := &CLI{
ConfigDir: configDir, ConfigDir: configDir,
HomeDir: t.TempDir(),
} }
for _, opt := range opts { for _, opt := range opts {
@ -188,6 +196,8 @@ func CopyFile(sourceFile string, destinationFile string) error {
// Docker / Compose commands. // Docker / Compose commands.
func (c *CLI) BaseEnvironment() []string { func (c *CLI) BaseEnvironment() []string {
return []string{ return []string{
"HOME=" + c.HomeDir,
"USER=" + os.Getenv("USER"),
"DOCKER_CONFIG=" + c.ConfigDir, "DOCKER_CONFIG=" + c.ConfigDir,
"KUBECONFIG=invalid", "KUBECONFIG=invalid",
} }