github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +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

11
pkg/registry/core/componentstatus/rest_test.go
View File

@@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
"k8s.io/kubernetes/pkg/probe"
"k8s.io/kubernetes/pkg/util/diff"
)
@@ -75,7 +76,7 @@ func createTestStatus(name string, status api.ConditionStatus, msg string, err s
func TestList_NoError(t *testing.T) {
r := NewTestREST(testResponse{result: probe.Success, data: "ok"})
got, err := r.List(api.NewContext(), nil)
got, err := r.List(genericapirequest.NewContext(), nil)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -89,7 +90,7 @@ func TestList_NoError(t *testing.T) {
func TestList_FailedCheck(t *testing.T) {
r := NewTestREST(testResponse{result: probe.Failure, data: ""})
got, err := r.List(api.NewContext(), nil)
got, err := r.List(genericapirequest.NewContext(), nil)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -104,7 +105,7 @@ func TestList_FailedCheck(t *testing.T) {
func TestList_UnknownError(t *testing.T) {
r := NewTestREST(testResponse{result: probe.Unknown, data: "", err: fmt.Errorf("fizzbuzz error")})
got, err := r.List(api.NewContext(), nil)
got, err := r.List(genericapirequest.NewContext(), nil)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -119,7 +120,7 @@ func TestList_UnknownError(t *testing.T) {
func TestGet_NoError(t *testing.T) {
r := NewTestREST(testResponse{result: probe.Success, data: "ok"})
got, err := r.Get(api.NewContext(), "test1", &metav1.GetOptions{})
got, err := r.Get(genericapirequest.NewContext(), "test1", &metav1.GetOptions{})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -131,7 +132,7 @@ func TestGet_NoError(t *testing.T) {
func TestGet_BadName(t *testing.T) {
r := NewTestREST(testResponse{result: probe.Success, data: "ok"})
_, err := r.Get(api.NewContext(), "invalidname", &metav1.GetOptions{})
_, err := r.Get(genericapirequest.NewContext(), "invalidname", &metav1.GetOptions{})
if err == nil {
t.Fatalf("Expected error, but did not get one")
}