1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/command: use stdlib for temp-dirs

Browse Source 
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 <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2025-04-01 12:07:57 +02:00
parent ce4b752274
commit db44e59be7
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cli/command/cli_test.go
View File

@ -9,6 +9,7 @@ import (
"net" "net"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
@ -22,7 +23,6 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/fs"
) )
func TestNewAPIClientFromFlags(t *testing.T) { 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. // Makes sure we don't hang forever on the initial connection.
// https://github.com/docker/cli/issues/3652 // https://github.com/docker/cli/issues/3652
func TestInitializeFromClientHangs(t *testing.T) { func TestInitializeFromClientHangs(t *testing.T) {
dir := t.TempDir() tmpDir := t.TempDir()
socket := filepath.Join(dir, "my.sock") socket := filepath.Join(tmpDir, "my.sock")
l, err := net.Listen("unix", socket) l, err := net.Listen("unix", socket)
assert.NilError(t, err) assert.NilError(t, err)
@ -317,12 +317,11 @@ func TestHooksEnabled(t *testing.T) {
"features": { "features": {
"hooks": "true" "hooks": "true"
}}` }}`
dir := fs.NewDir(t, "", fs.WithFile("config.json", configFile)) config.SetDir(t.TempDir())
defer dir.Remove() err := os.WriteFile(filepath.Join(config.Dir(), "config.json"), []byte(configFile), 0o600)
assert.NilError(t, err)
cli, err := NewDockerCli() cli, err := NewDockerCli()
assert.NilError(t, err) assert.NilError(t, err)
config.SetDir(dir.Path())
assert.Check(t, cli.HooksEnabled()) assert.Check(t, cli.HooksEnabled())
}) })
@ -332,12 +331,11 @@ func TestHooksEnabled(t *testing.T) {
"hooks": "true" "hooks": "true"
}}` }}`
t.Setenv("DOCKER_CLI_HOOKS", "false") t.Setenv("DOCKER_CLI_HOOKS", "false")
dir := fs.NewDir(t, "", fs.WithFile("config.json", configFile)) config.SetDir(t.TempDir())
defer dir.Remove() err := os.WriteFile(filepath.Join(config.Dir(), "config.json"), []byte(configFile), 0o600)
assert.NilError(t, err)
cli, err := NewDockerCli() cli, err := NewDockerCli()
assert.NilError(t, err) assert.NilError(t, err)
config.SetDir(dir.Path())
assert.Check(t, !cli.HooksEnabled()) assert.Check(t, !cli.HooksEnabled())
}) })
@ -347,12 +345,11 @@ func TestHooksEnabled(t *testing.T) {
"hooks": "true" "hooks": "true"
}}` }}`
t.Setenv("DOCKER_CLI_HINTS", "false") t.Setenv("DOCKER_CLI_HINTS", "false")
dir := fs.NewDir(t, "", fs.WithFile("config.json", configFile)) config.SetDir(t.TempDir())
defer dir.Remove() err := os.WriteFile(filepath.Join(config.Dir(), "config.json"), []byte(configFile), 0o600)
assert.NilError(t, err)
cli, err := NewDockerCli() cli, err := NewDockerCli()
assert.NilError(t, err) assert.NilError(t, err)
config.SetDir(dir.Path())
assert.Check(t, !cli.HooksEnabled()) assert.Check(t, !cli.HooksEnabled())
}) })
} }