InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration/system: remove "hdr" utility

Browse Source 
It was a very shallow wrapper around reading the response
headers, and querying those directly is more transparent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-07-26 12:19:22 +02:00
parent c4afa77157
commit d100fd6a77
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
integration/system/ping_test.go
View File

@@ -5,7 +5,6 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
"testing"
"github.com/docker/docker/testutil"
@@ -14,6 +13,7 @@ import (
"github.com/moby/moby/api/types/build"
"github.com/moby/moby/api/types/swarm"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/skip"
)
@@ -24,8 +24,8 @@ func TestPingCacheHeaders(t *testing.T) {
assert.NilError(t, err)
assert.Equal(t, res.StatusCode, http.StatusOK)
assert.Equal(t, hdr(res, "Cache-Control"), "no-cache, no-store, must-revalidate")
assert.Equal(t, hdr(res, "Pragma"), "no-cache")
assert.Assert(t, is.DeepEqual(res.Header.Values("Cache-Control"), []string{"no-cache, no-store, must-revalidate"}))
assert.Assert(t, is.DeepEqual(res.Header.Values("Pragma"), []string{"no-cache"}))
}
func TestPingGet(t *testing.T) {
@@ -38,7 +38,7 @@ func TestPingGet(t *testing.T) {
assert.NilError(t, err)
assert.Equal(t, string(b), "OK")
assert.Equal(t, res.StatusCode, http.StatusOK)
assert.Check(t, hdr(res, "Api-Version") != "")
assert.Check(t, res.Header.Get("Api-Version") != "")
}
func TestPingHead(t *testing.T) {
@@ -51,7 +51,7 @@ func TestPingHead(t *testing.T) {
assert.NilError(t, err)
assert.Equal(t, 0, len(b))
assert.Equal(t, res.StatusCode, http.StatusOK)
assert.Check(t, hdr(res, "Api-Version") != "")
assert.Check(t, res.Header.Get("Api-Version") != "")
}
func TestPingSwarmHeader(t *testing.T) {
@@ -134,11 +134,3 @@ func TestPingBuilderHeader(t *testing.T) {
assert.Equal(t, p.BuilderVersion, expected)
})
}
func hdr(res *http.Response, name string) string {
val, ok := res.Header[http.CanonicalHeaderKey(name)]
if !ok || len(val) == 0 {
return ""
}
return strings.Join(val, ", ")
}