Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1010916c
Commit
1010916c
authored
Aug 11, 2017
by
Shiyang Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add cmd-test for sort-by command
parent
7adb6750
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
73 additions
and
0 deletions
+73
-0
test.sh
hack/lib/test.sh
+11
-0
test-cmd-util.sh
hack/make-rules/test-cmd-util.sh
+32
-0
sorted-pod1.yaml
hack/testdata/sorted-pods/sorted-pod1.yaml
+10
-0
sorted-pod2.yaml
hack/testdata/sorted-pods/sorted-pod2.yaml
+10
-0
sorted-pod3.yaml
hack/testdata/sorted-pods/sorted-pod3.yaml
+10
-0
No files found.
hack/lib/test.sh
View file @
1010916c
...
@@ -250,6 +250,17 @@ kube::test::describe_resource_events_assert() {
...
@@ -250,6 +250,17 @@ kube::test::describe_resource_events_assert() {
fi
fi
}
}
# Compare sort-by resource name output with expected order specify in the last parameter
kube::test::if_sort_by_has_correct_order
()
{
local
array
=(
$(
echo
"
$1
"
|awk
'{if(NR!=1) print $1}'
)
)
local
var
for
i
in
"
${
array
[@]
}
"
;
do
var+
=
"
$i
:"
done
kube::test::if_has_string
"
$var
"
"
${
@
:
$#}
"
}
kube::test::if_has_string() {
kube::test::if_has_string() {
local message=
$1
local message=
$1
local match=
$2
local match=
$2
...
...
hack/make-rules/test-cmd-util.sh
View file @
1010916c
...
@@ -3940,6 +3940,38 @@ run_kubectl_sort_by_tests() {
...
@@ -3940,6 +3940,38 @@ run_kubectl_sort_by_tests() {
# Post-condition: valid-pod doesn't exist
# Post-condition: valid-pod doesn't exist
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
''
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
''
### sort-by should works by sorting by name
# Create three PODs
# Pre-condition: no POD exists
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
''
# Command
kubectl create
"
${
kube_flags
[@]
}
"
-f
hack/testdata/sorted-pods/sorted-pod1.yaml
# Post-condition: sorted-pod1 is created
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
'sorted-pod1:'
# Command
kubectl create
"
${
kube_flags
[@]
}
"
-f
hack/testdata/sorted-pods/sorted-pod2.yaml
# Post-condition: sorted-pod1 is created
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
'sorted-pod1:sorted-pod2:'
# Command
kubectl create
"
${
kube_flags
[@]
}
"
-f
hack/testdata/sorted-pods/sorted-pod3.yaml
# Post-condition: sorted-pod1 is created
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
'sorted-pod1:sorted-pod2:sorted-pod3:'
# Check output of sort-by '{metadata.name}'
output_message
=
$(
kubectl get pods
--sort-by
=
"{metadata.name}"
)
kube::test::if_sort_by_has_correct_order
"
${
output_message
}
"
"sorted-pod1:sorted-pod2:sorted-pod3:"
# Check output of sort-by '{metadata.labels.name}'
output_message
=
$(
kubectl get pods
--sort-by
=
"{metadata.labels.name}"
)
kube::test::if_sort_by_has_correct_order
"
${
output_message
}
"
"sorted-pod3:sorted-pod2:sorted-pod1:"
### Clean up
# Pre-condition: valid-pod exists
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
'sorted-pod1:sorted-pod2:sorted-pod3:'
# Command
kubectl delete
"
${
kube_flags
[@]
}
"
pod
--grace-period
=
0
--force
--all
# Post-condition: valid-pod doesn't exist
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
''
set
+o nounset
set
+o nounset
set
+o errexit
set
+o errexit
...
...
hack/testdata/sorted-pods/sorted-pod1.yaml
0 → 100644
View file @
1010916c
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
sorted-pod1
labels
:
name
:
sorted-pod3-label
spec
:
containers
:
-
name
:
kubernetes-pause
image
:
gcr.io/google-containers/pause:2.0
hack/testdata/sorted-pods/sorted-pod2.yaml
0 → 100644
View file @
1010916c
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
sorted-pod2
labels
:
name
:
sorted-pod2-label
spec
:
containers
:
-
name
:
kubernetes-pause
image
:
gcr.io/google-containers/pause:2.0
hack/testdata/sorted-pods/sorted-pod3.yaml
0 → 100644
View file @
1010916c
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
sorted-pod3
labels
:
name
:
sorted-pod1-label
spec
:
containers
:
-
name
:
kubernetes-pause
image
:
gcr.io/google-containers/pause:2.0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment