From 0215a62d5b97d866e29812b3b1a000f23546d23b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 26 Jun 2023 13:39:43 +0200 Subject: [PATCH] integration-cli: don't use pkg/homedir in test I'm considering deprecating the "Key()" utility, as it was only used in tests. Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_run_unix_test.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 23a3e7388c75f..e1112cdfd93de 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -11,6 +11,7 @@ import ( "os/exec" "path/filepath" "regexp" + "runtime" "strconv" "strings" "syscall" @@ -21,7 +22,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - "github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/sysinfo" "github.com/moby/sys/mount" @@ -250,7 +250,11 @@ func (s *DockerCLIRunSuite) TestRunAttachDetachFromConfig(c *testing.T) { os.Mkdir(dotDocker, 0600) tmpCfg := filepath.Join(dotDocker, "config.json") - c.Setenv(homedir.Key(), tmpDir) + if runtime.GOOS == "windows" { + c.Setenv("USERPROFILE", tmpDir) + } else { + c.Setenv("HOME", tmpDir) + } data := `{ "detachKeys": "ctrl-a,a" @@ -330,7 +334,11 @@ func (s *DockerCLIRunSuite) TestRunAttachDetachKeysOverrideConfig(c *testing.T) os.Mkdir(dotDocker, 0600) tmpCfg := filepath.Join(dotDocker, "config.json") - c.Setenv(homedir.Key(), tmpDir) + if runtime.GOOS == "windows" { + c.Setenv("USERPROFILE", tmpDir) + } else { + c.Setenv("HOME", tmpDir) + } data := `{ "detachKeys": "ctrl-e,e"