kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55115 from CaoShuFeng/crd_test 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

[trival]remove duplicated code from unit test

**Release note**:
```
NONE
```

Kubernetes-commit: 462d5ed1067d14f68c4bdaeb9469c37eab0172ea
This commit is contained in:
Kubernetes Publisher 2017-11-05 06:03:33 -08:00
parent 656d3dafc2 35655c329b
commit d5c7d449a9
2 changed files with 229 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

458
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

3
pkg/endpoints/handlers/rest_test.go
View File

@ -310,9 +310,6 @@ func (tc *patchTestCase) Run(t *testing.T) {
patch := []byte{} patch := []byte{}
switch patchType { switch patchType {
case types.JSONPatchType:
continue
case types.StrategicMergePatchType: case types.StrategicMergePatchType:
patch, err = strategicpatch.CreateTwoWayMergePatch(originalObjJS, changedJS, versionedObj) patch, err = strategicpatch.CreateTwoWayMergePatch(originalObjJS, changedJS, versionedObj)
if err != nil { if err != nil {