dockerversion: use t.Context() in tests

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-09-25 19:28:32 +02:00
parent aca0adfb97
commit e80e2908ba

View File

@@ -11,26 +11,26 @@ import (
func TestDockerUserAgent(t *testing.T) { func TestDockerUserAgent(t *testing.T) {
t.Run("daemon user-agent", func(t *testing.T) { t.Run("daemon user-agent", func(t *testing.T) {
ua := DockerUserAgent(context.TODO()) ua := DockerUserAgent(t.Context())
expected := getDaemonUserAgent() expected := getDaemonUserAgent()
assert.Check(t, is.Equal(ua, expected)) assert.Check(t, is.Equal(ua, expected))
}) })
t.Run("daemon user-agent custom metadata", func(t *testing.T) { t.Run("daemon user-agent custom metadata", func(t *testing.T) {
ua := DockerUserAgent(context.TODO(), useragent.VersionInfo{Name: "hello", Version: "world"}, useragent.VersionInfo{Name: "foo", Version: "bar"}) ua := DockerUserAgent(t.Context(), useragent.VersionInfo{Name: "hello", Version: "world"}, useragent.VersionInfo{Name: "foo", Version: "bar"})
expected := getDaemonUserAgent() + ` hello/world foo/bar` expected := getDaemonUserAgent() + ` hello/world foo/bar`
assert.Check(t, is.Equal(ua, expected)) assert.Check(t, is.Equal(ua, expected))
}) })
t.Run("daemon user-agent with upstream", func(t *testing.T) { t.Run("daemon user-agent with upstream", func(t *testing.T) {
ctx := context.WithValue(context.TODO(), UAStringKey{}, "Magic-Client/1.2.3 (linux)") ctx := context.WithValue(t.Context(), UAStringKey{}, "Magic-Client/1.2.3 (linux)")
ua := DockerUserAgent(ctx) ua := DockerUserAgent(ctx)
expected := getDaemonUserAgent() + ` UpstreamClient(Magic-Client/1.2.3 \(linux\))` expected := getDaemonUserAgent() + ` UpstreamClient(Magic-Client/1.2.3 \(linux\))`
assert.Check(t, is.Equal(ua, expected)) assert.Check(t, is.Equal(ua, expected))
}) })
t.Run("daemon user-agent with upstream and custom metadata", func(t *testing.T) { t.Run("daemon user-agent with upstream and custom metadata", func(t *testing.T) {
ctx := context.WithValue(context.TODO(), UAStringKey{}, "Magic-Client/1.2.3 (linux)") ctx := context.WithValue(t.Context(), UAStringKey{}, "Magic-Client/1.2.3 (linux)")
ua := DockerUserAgent(ctx, useragent.VersionInfo{Name: "hello", Version: "world"}, useragent.VersionInfo{Name: "foo", Version: "bar"}) ua := DockerUserAgent(ctx, useragent.VersionInfo{Name: "hello", Version: "world"}, useragent.VersionInfo{Name: "foo", Version: "bar"})
expected := getDaemonUserAgent() + ` hello/world foo/bar UpstreamClient(Magic-Client/1.2.3 \(linux\))` expected := getDaemonUserAgent() + ` hello/world foo/bar UpstreamClient(Magic-Client/1.2.3 \(linux\))`
assert.Check(t, is.Equal(ua, expected)) assert.Check(t, is.Equal(ua, expected))