github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55115 from CaoShuFeng/crd_test

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-05 06:03:33 -08:00 committed by GitHub
commit 462d5ed106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/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 {