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

Merge pull request #12146 from deads2k/tweak-testclient

Browse Source 
make testclient more precise
This commit is contained in:
Alex Mohr
2015-08-04 14:49:11 -07:00
parent 366b382901 182885e897
commit b90663924b
33 changed files with 1004 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/admission/exec/denyprivileged/admission_test.go
View File

@@ -37,8 +37,8 @@ func TestAdmissionDeny(t *testing.T) {
func testAdmission(t *testing.T, pod *api.Pod, shouldAccept bool) {
mockClient := &testclient.Fake{
ReactFn: func(action testclient.FakeAction) (runtime.Object, error) {
if action.Action == "get-pod" && action.Value.(string) == pod.Name {
ReactFn: func(action testclient.Action) (runtime.Object, error) {
if action.Matches("get", "pods") && action.(testclient.GetAction).GetName() == pod.Name {
return pod, nil
}
t.Errorf("Unexpected API call: %#v", action)

2
plugin/pkg/admission/namespace/autoprovision/admission_test.go
View File

@@ -49,7 +49,7 @@ func TestAdmission(t *testing.T) {
if len(actions) != 1 {
t.Errorf("Expected a create-namespace request")
}
if actions[0].Action != "create-namespace" {
if !actions[0].Matches("create", "namespaces") {
t.Errorf("Expected a create-namespace request to be made via the client")
}
}