Skip to content

Commit e0a6d6f

Browse files
committed
UPSTREAM: 59506: fix --watch on multiple requests
1 parent c9e126b commit e0a6d6f

File tree

2 files changed

+25
-3
lines changed
  • test/cmd
  • vendor/k8s.io/kubernetes/pkg/kubectl/cmd/resource

2 files changed

+25
-3
lines changed

test/cmd/get.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,11 @@ os::cmd::expect_success_and_not_text 'oc get users test-user-1' "customlabel=tru
3737
# test structured and unstructured resources print generically without panic
3838
os::cmd::expect_success_and_text 'oc get projectrequests -o yaml' 'status: Success'
3939
os::cmd::expect_success_and_text 'oc get projectrequests,svc,pod -o yaml' 'kind: List'
40+
# test --wacth does not result in an error when a resource list is served in multiple chunks
41+
os::cmd::expect_success 'oc create cm cm_one'
42+
os::cmd::expect_success 'oc create cm cm_two'
43+
os::cmd::expect_success 'oc create cm cm_three'
44+
os::cmd::expect_failure_and_not_text 'oc get configmap --chunk-size=1 --watch --request-timeout=1s' 'watch is only supported on individual resources'
45+
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'
4046
echo "oc get: ok"
4147
os::test::junit::declare_suite_end

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/resource/get.go

Lines changed: 19 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)