Yuvipanda has submitted this change and it was merged.
Change subject: Fix tests to run with v1.2.0
......................................................................
Fix tests to run with v1.2.0
Change-Id: I871dc98f6a45ae01a984b29d165365ea51c93b3e
---
M plugin/pkg/admission/uidenforcer/admission_test.go
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/plugin/pkg/admission/uidenforcer/admission_test.go
b/plugin/pkg/admission/uidenforcer/admission_test.go
index 92308f0..81c01de 100644
--- a/plugin/pkg/admission/uidenforcer/admission_test.go
+++ b/plugin/pkg/admission/uidenforcer/admission_test.go
@@ -23,7 +23,7 @@
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/auth/user"
- "k8s.io/kubernetes/pkg/client/unversioned/testclient"
+
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
)
func validPod(name string, numContainers int) api.Pod {
@@ -40,18 +40,18 @@
}
func TestFailWithNoUserInfo(t *testing.T) {
- client := testclient.NewSimpleFake()
+ client := fake.NewSimpleClientset()
enforcer := NewUidEnforcer(client)
testPod := validPod("test", 2)
- err := enforcer.Admit(admission.NewAttributesRecord(&testPod, "Pod",
"test", "testPod", "pods", "", admission.Update, nil))
+ err := enforcer.Admit(admission.NewAttributesRecord(&testPod,
api.Kind("Pod"), "test", "testPod", api.Resource("pods"), "", admission.Update,
nil))
if err == nil {
t.Errorf("Expected an error since the pod did not specify
resource limits in its update call")
}
}
func TestPodWithUID(t *testing.T) {
- client := testclient.NewSimpleFake()
+ client := fake.NewSimpleClientset()
enforcer := NewUidEnforcer(client)
testPod := validPod("test", 2)
@@ -61,7 +61,7 @@
Groups: nil,
}
- err := enforcer.Admit(admission.NewAttributesRecord(&testPod, "Pod",
"test", "testPod", "pods", "", admission.Update, userInfo))
+ err := enforcer.Admit(admission.NewAttributesRecord(&testPod,
api.Kind("Pod"), "test", "testPod", api.Resource("pods"), "", admission.Update,
userInfo))
if err != nil {
t.Errorf("%+v", err)
}
--
To view, visit https://gerrit.wikimedia.org/r/279677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I871dc98f6a45ae01a984b29d165365ea51c93b3e
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/kubernetes
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
