github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add v1 tests to tests in kubectl/cmd/*

Browse Source
This commit is contained in:
Chao Xu
2015-06-03 11:54:50 -07:00
parent 1845ca88fc
commit 8885025d25
4 changed files with 202 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/kubectl/cmd/portforward_test.go
View File

@@ -41,26 +41,38 @@ func TestPortForward(t *testing.T) {
tests := []struct {
name, version, podPath, pfPath, container string
nsInQuery bool
pod *api.Pod
pfErr bool
}{
{
name: "v1beta3 - pod portforward",
version: "v1beta3",
podPath: "/api/v1beta3/namespaces/test/pods/foo",
pfPath: "/api/v1beta3/namespaces/test/pods/foo/portforward",
nsInQuery: false,
pod: execPod(),
name: "v1beta3 - pod portforward",
version: "v1beta3",
podPath: "/api/v1beta3/namespaces/test/pods/foo",
pfPath: "/api/v1beta3/namespaces/test/pods/foo/portforward",
pod: execPod(),
},
{
name: "v1beta3 - pod portforward error",
version: "v1beta3",
podPath: "/api/v1beta3/namespaces/test/pods/foo",
pfPath: "/api/v1beta3/namespaces/test/pods/foo/portforward",
nsInQuery: false,
pod: execPod(),
pfErr: true,
name: "v1beta3 - pod portforward error",
version: "v1beta3",
podPath: "/api/v1beta3/namespaces/test/pods/foo",
pfPath: "/api/v1beta3/namespaces/test/pods/foo/portforward",
pod: execPod(),
pfErr: true,
},
{
name: "v1 - pod portforward",
version: "v1",
podPath: "/api/v1/namespaces/test/pods/foo",
pfPath: "/api/v1/namespaces/test/pods/foo/portforward",
pod: execPod(),
},
{
name: "v1 - pod portforward error",
version: "v1",
podPath: "/api/v1/namespaces/test/pods/foo",
pfPath: "/api/v1/namespaces/test/pods/foo/portforward",
pod: execPod(),
pfErr: true,
},
}
for _, test := range tests {
@@ -70,11 +82,6 @@ func TestPortForward(t *testing.T) {
Client: client.HTTPClientFunc(func(req *http.Request) (*http.Response, error) {
switch p, m := req.URL.Path, req.Method; {
case p == test.podPath && m == "GET":
if test.nsInQuery {
if ns := req.URL.Query().Get("namespace"); ns != "test" {
t.Errorf("%s: did not get expected namespace: %s\n", test.name, ns)
}
}
body := objBody(codec, test.pod)
return &http.Response{StatusCode: 200, Body: body}, nil
default: