beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace deprecated gotest.tools' env.Patch() with t.SetEnv()

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-03-06 22:45:04 +01:00
parent c93bffa1b2
commit a5f6500958
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
4 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/client_test.go
View file

@ -174,12 +174,12 @@ func TestParseHostURL(t *testing.T) {
} }
func TestNewClientWithOpsFromEnvSetsDefaultVersion(t *testing.T) { func TestNewClientWithOpsFromEnvSetsDefaultVersion(t *testing.T) {
defer env.PatchAll(t, map[string]string{ env.PatchAll(t, map[string]string{
"DOCKER_HOST": "", "DOCKER_HOST": "",
"DOCKER_API_VERSION": "", "DOCKER_API_VERSION": "",
"DOCKER_TLS_VERIFY": "", "DOCKER_TLS_VERIFY": "",
"DOCKER_CERT_PATH": "", "DOCKER_CERT_PATH": "",
})() })
client, err := NewClientWithOpts(FromEnv) client, err := NewClientWithOpts(FromEnv)
if err != nil { if err != nil {
@ -200,7 +200,7 @@ func TestNewClientWithOpsFromEnvSetsDefaultVersion(t *testing.T) {
// downgrades to the correct API version if the API's ping response does not // downgrades to the correct API version if the API's ping response does not
// return an API version. // return an API version.
func TestNegotiateAPIVersionEmpty(t *testing.T) { func TestNegotiateAPIVersionEmpty(t *testing.T) {
defer env.PatchAll(t, map[string]string{"DOCKER_API_VERSION": ""})() t.Setenv("DOCKER_API_VERSION", "")
client, err := NewClientWithOpts(FromEnv) client, err := NewClientWithOpts(FromEnv)
assert.NilError(t, err) assert.NilError(t, err)
@ -289,7 +289,7 @@ func TestNegotiateAPIVersion(t *testing.T) {
// environment variable when negotiating versions. // environment variable when negotiating versions.
func TestNegotiateAPVersionOverride(t *testing.T) { func TestNegotiateAPVersionOverride(t *testing.T) {
const expected = "9.99" const expected = "9.99"
defer env.PatchAll(t, map[string]string{"DOCKER_API_VERSION": expected})() t.Setenv("DOCKER_API_VERSION", expected)
client, err := NewClientWithOpts(FromEnv) client, err := NewClientWithOpts(FromEnv)
assert.NilError(t, err) assert.NilError(t, err)

5
client/options_test.go
View file

@ -6,7 +6,6 @@ import (
"github.com/docker/docker/api" "github.com/docker/docker/api"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/env"
) )
func TestOptionWithHostFromEnv(t *testing.T) { func TestOptionWithHostFromEnv(t *testing.T) {
@ -18,7 +17,7 @@ func TestOptionWithHostFromEnv(t *testing.T) {
assert.Equal(t, c.addr, defaultAddr) assert.Equal(t, c.addr, defaultAddr)
assert.Equal(t, c.basePath, "") assert.Equal(t, c.basePath, "")
defer env.Patch(t, "DOCKER_HOST", "tcp://foo.example.com:2376/test/")() t.Setenv("DOCKER_HOST", "tcp://foo.example.com:2376/test/")
c, err = NewClientWithOpts(WithHostFromEnv()) c, err = NewClientWithOpts(WithHostFromEnv())
assert.NilError(t, err) assert.NilError(t, err)
@ -44,7 +43,7 @@ func TestOptionWithVersionFromEnv(t *testing.T) {
assert.Equal(t, c.version, api.DefaultVersion) assert.Equal(t, c.version, api.DefaultVersion)
assert.Equal(t, c.manualOverride, false) assert.Equal(t, c.manualOverride, false)
defer env.Patch(t, "DOCKER_API_VERSION", "2.9999")() t.Setenv("DOCKER_API_VERSION", "2.9999")
c, err = NewClientWithOpts(WithVersionFromEnv()) c, err = NewClientWithOpts(WithVersionFromEnv())
assert.NilError(t, err) assert.NilError(t, err)

4
daemon/logger/splunk/splunk_test.go
View file

@ -11,7 +11,6 @@ import (
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/env"
) )
// Validate options // Validate options
@ -85,8 +84,7 @@ func TestNewMissedToken(t *testing.T) {
func TestNewWithProxy(t *testing.T) { func TestNewWithProxy(t *testing.T) {
proxy := "http://proxy.testing:8888" proxy := "http://proxy.testing:8888"
reset := env.Patch(t, "HTTP_PROXY", proxy) t.Setenv("HTTP_PROXY", proxy)
defer reset()
// must not be localhost // must not be localhost
splunkURL := "http://example.com:12345" splunkURL := "http://example.com:12345"

31
integration/daemon/daemon_test.go
View file

@ -18,7 +18,6 @@ import (
"github.com/docker/docker/testutil/daemon" "github.com/docker/docker/testutil/daemon"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/env"
"gotest.tools/v3/skip" "gotest.tools/v3/skip"
) )
@ -213,9 +212,9 @@ func TestDaemonProxy(t *testing.T) {
// Configure proxy through env-vars // Configure proxy through env-vars
t.Run("environment variables", func(t *testing.T) { t.Run("environment variables", func(t *testing.T) {
defer env.Patch(t, "HTTP_PROXY", proxyServer.URL)() t.Setenv("HTTP_PROXY", proxyServer.URL)
defer env.Patch(t, "HTTPS_PROXY", proxyServer.URL)() t.Setenv("HTTPS_PROXY", proxyServer.URL)
defer env.Patch(t, "NO_PROXY", "example.com")() t.Setenv("NO_PROXY", "example.com")
d := daemon.New(t) d := daemon.New(t)
c := d.NewClientT(t) c := d.NewClientT(t)
@ -241,12 +240,12 @@ func TestDaemonProxy(t *testing.T) {
// Configure proxy through command-line flags // Configure proxy through command-line flags
t.Run("command-line options", func(t *testing.T) { t.Run("command-line options", func(t *testing.T) {
defer env.Patch(t, "HTTP_PROXY", "http://"+userPass+"from-env-http.invalid")() t.Setenv("HTTP_PROXY", "http://"+userPass+"from-env-http.invalid")
defer env.Patch(t, "http_proxy", "http://"+userPass+"from-env-http.invalid")() t.Setenv("http_proxy", "http://"+userPass+"from-env-http.invalid")
defer env.Patch(t, "HTTPS_PROXY", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")() t.Setenv("HTTPS_PROXY", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")
defer env.Patch(t, "https_proxy", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")() t.Setenv("https_proxy", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")
defer env.Patch(t, "NO_PROXY", "ignore.invalid")() t.Setenv("NO_PROXY", "ignore.invalid")
defer env.Patch(t, "no_proxy", "ignore.invalid")() t.Setenv("no_proxy", "ignore.invalid")
d := daemon.New(t) d := daemon.New(t)
d.Start(t, "--http-proxy", proxyServer.URL, "--https-proxy", proxyServer.URL, "--no-proxy", "example.com") d.Start(t, "--http-proxy", proxyServer.URL, "--https-proxy", proxyServer.URL, "--no-proxy", "example.com")
@ -282,12 +281,12 @@ func TestDaemonProxy(t *testing.T) {
// Configure proxy through configuration file // Configure proxy through configuration file
t.Run("configuration file", func(t *testing.T) { t.Run("configuration file", func(t *testing.T) {
defer env.Patch(t, "HTTP_PROXY", "http://"+userPass+"from-env-http.invalid")() t.Setenv("HTTP_PROXY", "http://"+userPass+"from-env-http.invalid")
defer env.Patch(t, "http_proxy", "http://"+userPass+"from-env-http.invalid")() t.Setenv("http_proxy", "http://"+userPass+"from-env-http.invalid")
defer env.Patch(t, "HTTPS_PROXY", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")() t.Setenv("HTTPS_PROXY", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")
defer env.Patch(t, "https_proxy", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")() t.Setenv("https_proxy", "https://"+userPass+"myuser:mypassword@from-env-https.invalid")
defer env.Patch(t, "NO_PROXY", "ignore.invalid")() t.Setenv("NO_PROXY", "ignore.invalid")
defer env.Patch(t, "no_proxy", "ignore.invalid")() t.Setenv("no_proxy", "ignore.invalid")
d := daemon.New(t) d := daemon.New(t)
c := d.NewClientT(t) c := d.NewClientT(t)