Merge pull request #20456 from juanvallejo/jvallejo/update-patch-retu…

…rn-code-logic UPSTREAM: 66725: update exit code to 0 if patch not needed
openshift · Aug 1, 2018 · c83ba6c · c83ba6c
2 parents 0dc3307 + 11814da
commit c83ba6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/test/cmd/basicresources.sh b/test/cmd/basicresources.sh
@@ -325,6 +325,10 @@ os::cmd::expect_success          "echo '${group_json}' | oc create -f -"
 os::cmd::expect_success          "oc patch group patch-group -p 'users: [\"myuser\"]' --loglevel=8"
 os::cmd::expect_success_and_text 'oc get group patch-group -o yaml' 'myuser'
 os::cmd::expect_success          "oc patch group patch-group -p 'users: []' --loglevel=8"
+# applying the same patch twice results in exit code 0, and "not patched" text
+os::cmd::expect_success_and_text "oc patch group patch-group -p 'users: []'" "not patched"
+# applying an invalid patch results in exit code 1 and an error
+os::cmd::expect_failure_and_text "oc patch group patch-group -p 'users: \"\"'" "cannot restore slice from string"
 os::cmd::expect_success_and_text 'oc get group patch-group -o yaml' 'users: \[\]'
 echo "patch: ok"
 os::test::junit::declare_suite_end

diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/patch.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/patch.go