github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Move pkg/api.{Context,RequestContextMapper} into pkg/genericapiserver/api/request

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-02 15:07:36 +01:00
parent 2d58ffc129
commit 87dd990bb7
265 changed files with 1256 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/registry/core/pod/strategy_test.go
View File

@@ -26,6 +26,7 @@ import (
"k8s.io/kubernetes/pkg/apimachinery/registered"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/fields"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
)
@@ -136,7 +137,7 @@ func TestCheckGracefulDelete(t *testing.T) {
}
for _, tc := range tcs {
out := &api.DeleteOptions{GracePeriodSeconds: &defaultGracePeriod}
Strategy.CheckGracefulDelete(api.NewContext(), tc.in, out)
Strategy.CheckGracefulDelete(genericapirequest.NewContext(), tc.in, out)
if out.GracePeriodSeconds == nil {
t.Errorf("out grace period was nil but supposed to be %v", tc.gracePeriod)
}
@@ -150,12 +151,12 @@ type mockPodGetter struct {
pod *api.Pod
}
func (g mockPodGetter) Get(api.Context, string, *metav1.GetOptions) (runtime.Object, error) {
func (g mockPodGetter) Get(genericapirequest.Context, string, *metav1.GetOptions) (runtime.Object, error) {
return g.pod, nil
}
func TestCheckLogLocation(t *testing.T) {
ctx := api.NewDefaultContext()
ctx := genericapirequest.NewDefaultContext()
tcs := []struct {
in *api.Pod
opts *api.PodLogOptions