Merge pull request #17316 from deads2k/gv-ClientForVersion

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-24 06:24:28 -08:00
45 changed files with 314 additions and 224 deletions

View File

@@ -122,7 +122,7 @@ func TestGetUnknownSchemaObject(t *testing.T) {
Resp: &http.Response{StatusCode: 200, Body: objBody(codec, &internalType{Name: "foo"})},
}
tf.Namespace = "test"
tf.ClientConfig = &client.Config{Version: testapi.Default.Version()}
tf.ClientConfig = &client.Config{GroupVersion: testapi.Default.GroupVersion()}
buf := bytes.NewBuffer([]byte{})
cmd := NewCmdGet(f, buf)
@@ -194,7 +194,7 @@ func TestGetUnknownSchemaObjectListGeneric(t *testing.T) {
}),
}
tf.Namespace = "test"
tf.ClientConfig = &client.Config{Version: testapi.Default.Version()}
tf.ClientConfig = &client.Config{GroupVersion: testapi.Default.GroupVersion()}
buf := bytes.NewBuffer([]byte{})
cmd := NewCmdGet(f, buf)
cmd.SetOutput(buf)
@@ -236,7 +236,7 @@ func TestGetSchemaObject(t *testing.T) {
Resp: &http.Response{StatusCode: 200, Body: objBody(codec, &api.ReplicationController{ObjectMeta: api.ObjectMeta{Name: "foo"}})},
}
tf.Namespace = "test"
tf.ClientConfig = &client.Config{Version: "v1"}
tf.ClientConfig = &client.Config{GroupVersion: &unversioned.GroupVersion{Version: "v1"}}
buf := bytes.NewBuffer([]byte{})
cmd := NewCmdGet(f, buf)
@@ -461,7 +461,7 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) {
}),
}
tf.Namespace = "test"
tf.ClientConfig = &client.Config{Version: testapi.Default.Version()}
tf.ClientConfig = &client.Config{GroupVersion: testapi.Default.GroupVersion()}
buf := bytes.NewBuffer([]byte{})
cmd := NewCmdGet(f, buf)