From db44e59be76c55b2f234720880669ab471874603 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 1 Apr 2025 12:07:57 +0200 Subject: [PATCH] cli/command: use stdlib for temp-dirs gotest.tools' fs package only provides very minimal benefits here; use stdlib functions to make things slightly more transparent. Signed-off-by: Sebastiaan van Stijn --- cli/command/cli_test.go | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/cli/command/cli_test.go b/cli/command/cli_test.go index 8e351cac11..ea67d40363 100644 --- a/cli/command/cli_test.go +++ b/cli/command/cli_test.go @@ -9,6 +9,7 @@ import ( "net" "net/http" "net/http/httptest" + "os" "path/filepath" "runtime" "strings" @@ -22,7 +23,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" "gotest.tools/v3/assert" - "gotest.tools/v3/fs" ) func TestNewAPIClientFromFlags(t *testing.T) { @@ -205,8 +205,8 @@ func TestInitializeFromClient(t *testing.T) { // Makes sure we don't hang forever on the initial connection. // https://github.com/docker/cli/issues/3652 func TestInitializeFromClientHangs(t *testing.T) { - dir := t.TempDir() - socket := filepath.Join(dir, "my.sock") + tmpDir := t.TempDir() + socket := filepath.Join(tmpDir, "my.sock") l, err := net.Listen("unix", socket) assert.NilError(t, err) @@ -317,12 +317,11 @@ func TestHooksEnabled(t *testing.T) { "features": { "hooks": "true" }}` - dir := fs.NewDir(t, "", fs.WithFile("config.json", configFile)) - defer dir.Remove() + config.SetDir(t.TempDir()) + err := os.WriteFile(filepath.Join(config.Dir(), "config.json"), []byte(configFile), 0o600) + assert.NilError(t, err) cli, err := NewDockerCli() assert.NilError(t, err) - config.SetDir(dir.Path()) - assert.Check(t, cli.HooksEnabled()) }) @@ -332,12 +331,11 @@ func TestHooksEnabled(t *testing.T) { "hooks": "true" }}` t.Setenv("DOCKER_CLI_HOOKS", "false") - dir := fs.NewDir(t, "", fs.WithFile("config.json", configFile)) - defer dir.Remove() + config.SetDir(t.TempDir()) + err := os.WriteFile(filepath.Join(config.Dir(), "config.json"), []byte(configFile), 0o600) + assert.NilError(t, err) cli, err := NewDockerCli() assert.NilError(t, err) - config.SetDir(dir.Path()) - assert.Check(t, !cli.HooksEnabled()) }) @@ -347,12 +345,11 @@ func TestHooksEnabled(t *testing.T) { "hooks": "true" }}` t.Setenv("DOCKER_CLI_HINTS", "false") - dir := fs.NewDir(t, "", fs.WithFile("config.json", configFile)) - defer dir.Remove() + config.SetDir(t.TempDir()) + err := os.WriteFile(filepath.Join(config.Dir(), "config.json"), []byte(configFile), 0o600) + assert.NilError(t, err) cli, err := NewDockerCli() assert.NilError(t, err) - config.SetDir(dir.Path()) - assert.Check(t, !cli.HooksEnabled()) }) }