github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34802 from ivan4th/remove-duplicated-code-in-kubectl-portforward-test

Browse Source 
Automatic merge from submit-queue

Remove duplicated code in kubectl portforward test
This commit is contained in:
Kubernetes Submit Queue 2016-10-15 09:31:28 -07:00 committed by GitHub
commit d21af56e05
1 changed files with 10 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ func (f *fakePortForwarder) ForwardPorts(method string, url *url.URL, opts PortF
return f.pfErr return f.pfErr
} }
func TestPortForward(t *testing.T) { func testPortForward(t *testing.T, flags map[string]string, args []string) {
version := registered.GroupOrDie(api.GroupName).GroupVersion.Version version := registered.GroupOrDie(api.GroupName).GroupVersion.Version
tests := []struct { tests := []struct {
@ -102,7 +102,10 @@ func TestPortForward(t *testing.T) {
err = opts.RunPortForward() err = opts.RunPortForward()
} }
cmd.Run(cmd, []string{"foo", ":5000", ":1000"}) for name, value := range flags {
cmd.Flags().Set(name, value)
}
cmd.Run(cmd, args)
if test.pfErr && err != ff.pfErr { if test.pfErr && err != ff.pfErr {
t.Errorf("%s: Unexpected port-forward error: %v", test.name, err) t.Errorf("%s: Unexpected port-forward error: %v", test.name, err)
@ -123,83 +126,10 @@ func TestPortForward(t *testing.T) {
} }
} }
func TestPortForward(t *testing.T) {
testPortForward(t, nil, []string{"foo", ":5000", ":1000"})
}
func TestPortForwardWithPFlag(t *testing.T) { func TestPortForwardWithPFlag(t *testing.T) {
version := registered.GroupOrDie(api.GroupName).GroupVersion.Version testPortForward(t, map[string]string{"pod": "foo"}, []string{":5000", ":1000"})
tests := []struct {
name, podPath, pfPath, container string
pod *api.Pod
pfErr bool
}{
{
name: "pod portforward",
podPath: "/api/" + version + "/namespaces/test/pods/foo",
pfPath: "/api/" + version + "/namespaces/test/pods/foo/portforward",
pod: execPod(),
},
{
name: "pod portforward error",
podPath: "/api/" + version + "/namespaces/test/pods/foo",
pfPath: "/api/" + version + "/namespaces/test/pods/foo/portforward",
pod: execPod(),
pfErr: true,
},
}
for _, test := range tests {
var err error
f, tf, codec, ns := NewAPIFactory()
tf.Client = &fake.RESTClient{
NegotiatedSerializer: ns,
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
switch p, m := req.URL.Path, req.Method; {
case p == test.podPath && m == "GET":
body := objBody(codec, test.pod)
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: body}, nil
default:
// Ensures no GET is performed when deleting by name
t.Errorf("%s: unexpected request: %#v\n%#v", test.name, req.URL, req)
return nil, nil
}
}),
}
tf.Namespace = "test"
tf.ClientConfig = defaultClientConfig()
ff := &fakePortForwarder{}
if test.pfErr {
ff.pfErr = fmt.Errorf("pf error")
}
opts := &PortForwardOptions{}
cmd := NewCmdPortForward(f, os.Stdout, os.Stderr)
cmd.Run = func(cmd *cobra.Command, args []string) {
if err = opts.Complete(f, cmd, args, os.Stdout, os.Stderr); err != nil {
return
}
opts.PortForwarder = ff
if err = opts.Validate(); err != nil {
return
}
err = opts.RunPortForward()
}
cmd.Flags().Set("pod", "foo")
cmd.Run(cmd, []string{":5000", ":1000"})
if test.pfErr && err != ff.pfErr {
t.Errorf("%s: Unexpected port-forward error: %v", test.name, err)
}
if !test.pfErr && err != nil {
t.Errorf("%s: Unexpected error: %v", test.name, err)
}
if test.pfErr {
continue
}
if ff.url.Path != test.pfPath {
t.Errorf("%s: Did not get expected path for portforward request", test.name)
}
if ff.method != "POST" {
t.Errorf("%s: Did not get method for attach request: %s", test.name, ff.method)
}
}
} }