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

Merge pull request #33546 from k82cn/k8s_15834

Browse Source 
Automatic merge from submit-queue

Updated err message when retrieving resources by name with --all-name…

fixes #15834
This commit is contained in:
Kubernetes Submit Queue
2016-10-15 06:50:00 -07:00
committed by GitHub
parent 88d6d7a677 005b8dad14
commit 9174429776
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hack/make-rules/test-cmd.sh
View File

@@ -1581,9 +1581,9 @@ __EOF__
# Clean up
kubectl delete namespace my-namespace
##############
######################
# Pods in Namespaces #
##############
######################
### Create a new namespace
# Pre-condition: the other namespace does not exist
@@ -1602,6 +1602,9 @@ __EOF__
kube::test::get_object_assert 'pods --namespace=other' "{{range.items}}{{$id_field}}:{{end}}" 'valid-pod:'
# Post-condition: verify shorthand `-n other` has the same results as `--namespace=other`
kube::test::get_object_assert 'pods -n other' "{{range.items}}{{$id_field}}:{{end}}" 'valid-pod:'
# Post-condition: a resource cannot be retrieved by name across all namespaces
output_message=$(! kubectl get "${kube_flags[@]}" pod valid-pod --all-namespaces 2>&1)
kube::test::if_has_string "${output_message}" "a resource cannot be retrieved by name across all namespaces"
### Delete POD valid-pod in specific namespace
# Pre-condition: valid-pod POD exists
@@ -1613,9 +1616,9 @@ __EOF__
# Clean up
kubectl delete namespace other
##############
###########
# Secrets #
##############
###########
### Create a new namespace
# Pre-condition: the test-secrets namespace does not exist