vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

More httputil tests for the docker header

Browse source 
follow-on to #15911

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis 2015-08-28 11:54:44 -07:00
parent 0ffa6f1bb6
commit 9bf309f3f8
2 changed files with 49 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
httputils/httputils.go
View file

@ -5,12 +5,13 @@ import (
"fmt"
"net/http"
"regexp"
"strings"
"github.com/docker/docker/pkg/jsonmessage"
)
var (
headerRegexp = regexp.MustCompile(`^(?:(.+)/(.+))\s\((.+)\).*$`)
headerRegexp = regexp.MustCompile(`^(?:(.+)/(.+?))\((.+)\).*$`)
errInvalidHeader = errors.New("Bad header, should be in format `docker/version (platform)`")
)
@ -48,8 +49,8 @@ func ParseServerHeader(hdr string) (*ServerHeader, error) {
return nil, errInvalidHeader
}
return &ServerHeader{
App: matches[1],
Ver: matches[2],
OS: matches[3],
App: strings.TrimSpace(matches[1]),
Ver: strings.TrimSpace(matches[2]),
OS: strings.TrimSpace(matches[3]),
}, nil
}

60
httputils/httputils_test.go
View file

@ -24,36 +24,52 @@ func TestNewHTTPRequestError(t *testing.T) {
}
func TestParseServerHeader(t *testing.T) {
if _, err := ParseServerHeader("bad header"); err != errInvalidHeader {
t.Fatalf("Should fail when header can not be parsed")
inputs := map[string][]string{
"bad header": {"error"},
"(bad header)": {"error"},
"(without/spaces)": {"error"},
"(header/with spaces)": {"error"},
"foo/bar (baz)": {"foo", "bar", "baz"},
"foo/bar": {"error"},
"foo": {"error"},
"foo/bar (baz space)": {"foo", "bar", "baz space"},
" f f / b b ( b s ) ": {"f f", "b b", "b s"},
"foo/bar (baz) ignore": {"foo", "bar", "baz"},
"foo/bar ()": {"error"},
"foo/bar()": {"error"},
"foo/bar(baz)": {"foo", "bar", "baz"},
"foo/bar/zzz(baz)": {"foo/bar", "zzz", "baz"},
"foo/bar(baz/abc)": {"foo", "bar", "baz/abc"},
"foo/bar(baz (abc))": {"foo", "bar", "baz (abc)"},
}
if _, err := ParseServerHeader("(bad header)"); err != errInvalidHeader {
t.Fatalf("Should fail when header can not be parsed")
}
if _, err := ParseServerHeader("(without/spaces)"); err != errInvalidHeader {
t.Fatalf("Should fail when header can not be parsed")
}
if _, err := ParseServerHeader("(header/with space)"); err != errInvalidHeader {
t.Fatalf("Expected err to not exist when ParseServerHeader(\"(header/with space)\")")
}
serverHeader, err := ParseServerHeader("foo/bar (baz)")
for header, values := range inputs {
serverHeader, err := ParseServerHeader(header)
if err != nil {
t.Fatal(err)
if err != errInvalidHeader {
t.Fatalf("Failed to parse %q, and got some unexpected error: %q", header, err)
}
if values[0] == "error" {
continue
}
t.Fatalf("Header %q failed to parse when it shouldn't have", header)
}
if values[0] == "error" {
t.Fatalf("Header %q parsed ok when it should have failed(%q).", header, serverHeader)
}
if serverHeader.App != "foo" {
t.Fatalf("Expected serverHeader.App to equal \"foo\", got %s", serverHeader.App)
if serverHeader.App != values[0] {
t.Fatalf("Expected serverHeader.App for %q to equal %q, got %q", header, values[0], serverHeader.App)
}
if serverHeader.Ver != "bar" {
t.Fatalf("Expected serverHeader.Ver to equal \"bar\", got %s", serverHeader.Ver)
if serverHeader.Ver != values[1] {
t.Fatalf("Expected serverHeader.Ver for %q to equal %q, got %q", header, values[1], serverHeader.Ver)
}
if serverHeader.OS != "baz" {
t.Fatalf("Expected serverHeader.OS to equal \"baz\", got %s", serverHeader.OS)
if serverHeader.OS != values[2] {
t.Fatalf("Expected serverHeader.OS for %q to equal %q, got %q", header, values[2], serverHeader.OS)
}
}
}