Merge pull request #17535 from mesosphere/jdef_abspath_breaks_proxies

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-20 21:46:47 -08:00
17 changed files with 158 additions and 119 deletions

View File

@@ -145,14 +145,10 @@ func TestSetWithPathPrefixIntoExistingStruct(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
expectedHost := "http://cow.org:8080"
expectedHost := "http://cow.org:8080/foo/baz"
if expectedHost != dcc.Host {
t.Fatalf("expected client.Config.Host = %q instead of %q", expectedHost, dcc.Host)
}
expectedPrefix := "/foo/baz"
if expectedPrefix != dcc.Prefix {
t.Fatalf("expected client.Config.Prefix = %q instead of %q", expectedPrefix, dcc.Prefix)
}
}
func TestUnsetStruct(t *testing.T) {