From 791b81af6b606cb07f2910bd5bf7ad21ec5ef23e Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Tue, 28 Apr 2020 12:56:17 +0200 Subject: [PATCH] oc get --request-timeout: Timeout exceeded while reading body printed with -v=5 Expected "Timeout exceeded while reading body" error message is printed with -v=5. Without the error message, both --watch oc get commands unexpectedly fail. --- test/extended/testdata/bindata.go | 4 ++-- test/extended/testdata/cmd/test/cmd/timeout.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index f7b07fbecbe5..b7292dcf4db7 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -46693,10 +46693,10 @@ trap os::test::junit::reconcile_output EXIT os::test::junit::declare_suite_start "cmd/request-timeout" # This test validates the global request-timeout option os::cmd::expect_success 'oc create deploymentconfig testdc --image=busybox' -os::cmd::expect_success_and_text 'oc get dc/testdc -w --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' +os::cmd::expect_success_and_text 'oc get dc/testdc -w -v=5 --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' os::cmd::expect_success_and_text 'oc get dc/testdc --request-timeout=1s' 'testdc' os::cmd::expect_success_and_text 'oc get dc/testdc --request-timeout=1' 'testdc' -os::cmd::expect_success_and_text 'oc get pods --watch --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' +os::cmd::expect_success_and_text 'oc get pods --watch -v=5 --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' echo "request-timeout: ok" os::test::junit::declare_suite_end diff --git a/test/extended/testdata/cmd/test/cmd/timeout.sh b/test/extended/testdata/cmd/test/cmd/timeout.sh index 93eb9e64f114..a41bbd25fb4b 100755 --- a/test/extended/testdata/cmd/test/cmd/timeout.sh +++ b/test/extended/testdata/cmd/test/cmd/timeout.sh @@ -13,10 +13,10 @@ trap os::test::junit::reconcile_output EXIT os::test::junit::declare_suite_start "cmd/request-timeout" # This test validates the global request-timeout option os::cmd::expect_success 'oc create deploymentconfig testdc --image=busybox' -os::cmd::expect_success_and_text 'oc get dc/testdc -w --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' +os::cmd::expect_success_and_text 'oc get dc/testdc -w -v=5 --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' os::cmd::expect_success_and_text 'oc get dc/testdc --request-timeout=1s' 'testdc' os::cmd::expect_success_and_text 'oc get dc/testdc --request-timeout=1' 'testdc' -os::cmd::expect_success_and_text 'oc get pods --watch --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' +os::cmd::expect_success_and_text 'oc get pods --watch -v=5 --request-timeout=1s 2>&1' 'Timeout exceeded while reading body' echo "request-timeout: ok" os::test::junit::declare_suite_end