Fix test-cmd

Author: soltysh

hack/test-cmd.sh

@@ -19,7 +19,7 @@ function find_tests() {
     local full_test_list=()
     local selected_tests=()
 
-    full_test_list=( $(find "${OS_ROOT}/test/cmd" -name '*.sh' -not -wholename '*images_tests.sh') )
+    full_test_list=( $(find "${OS_ROOT}/test/cmd" -name '*.sh') )
     for test in "${full_test_list[@]}"; do
         if grep -q -E "${test_regex}" <<< "${test}"; then
             selected_tests+=( "${test}" )

test/cmd/convert.sh

@@ -20,7 +20,7 @@ os::test::junit::declare_suite_start "cmd/convert"
 # This test validates the convert command
 
 os::cmd::expect_success "oc convert -f test/testdata/convert/job-v1.yaml | grep 'apiVersion: batch/v1'"
-os::cmd::expect_success "oc convert -f test/testdata/convert/job-v2.json | grep 'apiVersion: batch/v2alpha1'"
+os::cmd::expect_success "oc convert -f test/testdata/convert/job-v2.json --output-version=batch/v1beta1 | grep 'apiVersion: batch/v1beta1'"
 
 os::cmd::expect_success_and_text "oc convert -f test/testdata/convert | oc create --dry-run -f -" 'job "pi" created'
 os::cmd::expect_success_and_text "oc convert -f test/testdata/convert | oc create --dry-run -f -" 'cronjob "hello" created'

test/cmd/debug.sh

@@ -42,7 +42,8 @@ os::cmd::expect_success_and_text "oc debug --request-timeout=10s -c ruby-hellowo
 os::cmd::expect_success 'oc scale --replicas=0 dc/test-deployment-config'
 os::cmd::expect_success_and_text "oc debug --request-timeout=10s -c ruby-helloworld --one-container dc/test-deployment-config -o jsonpath='{.metadata.name}'" 'test-deployment-config'
 
-os::cmd::expect_success 'oc create -f - >> cat << __EOF__
+tmp_deploy="$(mktemp)"
+os::cmd::expect_success 'oc create -f - >> $tmp_deploy << __EOF__
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:

test/cmd/describer.sh

@@ -31,7 +31,7 @@ __EOF__
 '
 os::cmd::try_until_success 'eventnum=$(oc get events | wc -l) && [[ $eventnum -gt 0 ]]'
 # resources without describers get a default
-os::cmd::expect_success_and_text 'oc describe events' 'Namespace:	cmd-describer'
+os::cmd::expect_success_and_text 'oc describe events' 'Namespace:\w+cmd-describer'
 
 echo "describer: ok"
 os::test::junit::declare_suite_end

test/testdata/convert/job-v2.json

@@ -1,5 +1,5 @@
 {
-    "kind": "ScheduledJob",
+    "kind": "CronJob",
     "apiVersion": "batch/v2alpha1",
     "metadata": {
         "name": "hello",

test/testdata/multiport-service.yaml

@@ -20,10 +20,10 @@ items:
     - name: web2
       port: 5433
       protocol: TCP
-      targetPort: 8080
+      targetPort: 8081
     selector:
       name: frontend
     sessionAffinity: None
     type: ClusterIP
   status:
-    loadBalancer: {}
+    loadBalancer: {}