UPSTREAM: 59506: fix --watch on multiple requests

openshift · Feb 12, 2018 · e0a6d6f · e0a6d6f
1 parent c9e126b
commit e0a6d6f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/test/cmd/get.sh b/test/cmd/get.sh
@@ -37,5 +37,11 @@ os::cmd::expect_success_and_not_text 'oc get users test-user-1' "customlabel=tru
 # test structured and unstructured resources print generically without panic
 os::cmd::expect_success_and_text 'oc get projectrequests -o yaml' 'status: Success'
 os::cmd::expect_success_and_text 'oc get projectrequests,svc,pod -o yaml' 'kind: List'
+# test --wacth does not result in an error when a resource list is served in multiple chunks
+os::cmd::expect_success 'oc create cm cm_one'
+os::cmd::expect_success 'oc create cm cm_two'
+os::cmd::expect_success 'oc create cm cm_three'
+os::cmd::expect_failure_and_not_text 'oc get configmap --chunk-size=1 --watch --request-timeout=1s' 'watch is only supported on individual resources'
+os::cmd::expect_failure_and_not_text 'oc get configmap --chunk-size=1 --watch-only --request-timeout=1s' 'watch is only supported on individual resources'
 echo "oc get: ok"
 os::test::junit::declare_suite_end
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/resource/get.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/resource/get.go