github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

minor test fixes; update test-cmd tests to match updated resource selector behavior

Browse Source
This commit is contained in:
juanvallejo 2017-10-18 11:14:32 -04:00
parent ee2f9c95e7
commit bb86297edf
No known key found for this signature in database
GPG Key ID: 7D2C958002D6448D
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hack/make-rules/test-cmd-util.sh
View File

@ -916,7 +916,7 @@ __EOF__
} }
# runs specific kubectl create tests # runs specific kubectl create tests
run_create_tests() { run_create_secret_tests() {
set -o nounset set -o nounset
set -o errexit set -o errexit
@ -4289,11 +4289,17 @@ run_cluster_management_tests() {
response=$(! kubectl cordon 2>&1) response=$(! kubectl cordon 2>&1)
kube::test::if_has_string "${response}" 'error\: USAGE\: cordon NODE' kube::test::if_has_string "${response}" 'error\: USAGE\: cordon NODE'
### kubectl cordon selects all nodes with an empty --selector= ### kubectl cordon selects no nodes with an empty --selector=
# Pre-condition: node "127.0.0.1" is uncordoned # Pre-condition: node "127.0.0.1" is uncordoned
kubectl uncordon "127.0.0.1" kubectl uncordon "127.0.0.1"
response=$(kubectl cordon --selector=) response=$(! kubectl cordon --selector= 2>&1)
kube::test::if_has_string "${response}" 'must provide one or more resources'
# test=label matches our node
response=$(kubectl cordon --selector test=label)
kube::test::if_has_string "${response}" 'node "127.0.0.1" cordoned' kube::test::if_has_string "${response}" 'node "127.0.0.1" cordoned'
# invalid=label does not match any nodes
response=$(kubectl cordon --selector invalid=label)
kube::test::if_has_not_string "${response}" 'cordoned'
# Post-condition: node "127.0.0.1" is cordoned # Post-condition: node "127.0.0.1" is cordoned
kube::test::get_object_assert "nodes 127.0.0.1" "{{.spec.unschedulable}}" 'true' kube::test::get_object_assert "nodes 127.0.0.1" "{{.spec.unschedulable}}" 'true'
@ -4599,7 +4605,7 @@ runTests() {
# Create # # Create #
###################### ######################
if kube::test::if_supports_resource "${secrets}" ; then if kube::test::if_supports_resource "${secrets}" ; then
record_command run_create_tests record_command run_create_secret_tests
fi fi
################## ##################