Skip to content

Commit

Permalink
Merge pull request #16283 from juanvallejo/jvallejo/add-test-PR-16082
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 15927, 16283, 16239, 16271, 16287)

ensure `oc get` handles mixed resource types

Adds a test to ensure `oc get` does not panic when given a list
of both structured and unstructured resources.

Tests changes added in #16082

cc @enj @openshift/cli-review
  • Loading branch information
openshift-merge-robot committed Sep 12, 2017
2 parents 2b81cd2 + 70542a2 commit 97a034f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions test/cmd/get.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ os::cmd::expect_success 'oc create user test-user-1'
os::cmd::expect_success 'oc label user/test-user-1 customlabel=true'
os::cmd::expect_success_and_text 'oc get users test-user-1 --show-labels' "customlabel=true"
os::cmd::expect_success_and_not_text 'oc get users test-user-1' "customlabel=true"
echo "oc get all: ok"
os::test::junit::declare_suite_end
# 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'
echo "oc get: ok"
os::test::junit::declare_suite_end

0 comments on commit 97a034f

Please sign in to comment.