github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix test cases with more details

Browse Source
This commit is contained in:
Clayton Coleman 2017-02-28 19:08:37 -05:00
parent b3485e7c6a
commit b78321c67f
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2036,7 +2036,7 @@ run_rc_tests() {
# Post-condition: frontend replication controller is created # Post-condition: frontend replication controller is created
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'frontend:' kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'frontend:'
# Describe command should print detailed information # Describe command should print detailed information
kube::test::describe_object_assert rc 'frontend' "Name:" "Image(s):" "Labels:" "Selector:" "Replicas:" "Pods Status:" kube::test::describe_object_assert rc 'frontend' "Name:" "Pod Template:" "Labels:" "Selector:" "Replicas:" "Pods Status:" "Volumes:" "GET_HOSTS_FROM:"
# Describe command should print events information by default # Describe command should print events information by default
kube::test::describe_object_events_assert rc 'frontend' kube::test::describe_object_events_assert rc 'frontend'
# Describe command should not print events information when show-events=false # Describe command should not print events information when show-events=false
@ -2044,7 +2044,7 @@ run_rc_tests() {
# Describe command should print events information when show-events=true # Describe command should print events information when show-events=true
kube::test::describe_object_events_assert rc 'frontend' true kube::test::describe_object_events_assert rc 'frontend' true
# Describe command (resource only) should print detailed information # Describe command (resource only) should print detailed information
kube::test::describe_resource_assert rc "Name:" "Name:" "Image(s):" "Labels:" "Selector:" "Replicas:" "Pods Status:" kube::test::describe_resource_assert rc "Name:" "Name:" "Pod Template:" "Labels:" "Selector:" "Replicas:" "Pods Status:" "Volumes:" "GET_HOSTS_FROM:"
# Describe command should print events information by default # Describe command should print events information by default
kube::test::describe_resource_events_assert rc kube::test::describe_resource_events_assert rc
# Describe command should not print events information when show-events=false # Describe command should not print events information when show-events=false
@ -2444,7 +2444,7 @@ run_rs_tests() {
# Post-condition: frontend replica set is created # Post-condition: frontend replica set is created
kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" 'frontend:' kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" 'frontend:'
# Describe command should print detailed information # Describe command should print detailed information
kube::test::describe_object_assert rs 'frontend' "Name:" "Image(s):" "Labels:" "Selector:" "Replicas:" "Pods Status:" kube::test::describe_object_assert rs 'frontend' "Name:" "Pod Template:" "Labels:" "Selector:" "Replicas:" "Pods Status:" "Volumes:"
# Describe command should print events information by default # Describe command should print events information by default
kube::test::describe_object_events_assert rs 'frontend' kube::test::describe_object_events_assert rs 'frontend'
# Describe command should not print events information when show-events=false # Describe command should not print events information when show-events=false
@ -2452,7 +2452,7 @@ run_rs_tests() {
# Describe command should print events information when show-events=true # Describe command should print events information when show-events=true
kube::test::describe_object_events_assert rs 'frontend' true kube::test::describe_object_events_assert rs 'frontend' true
# Describe command (resource only) should print detailed information # Describe command (resource only) should print detailed information
kube::test::describe_resource_assert rs "Name:" "Name:" "Image(s):" "Labels:" "Selector:" "Replicas:" "Pods Status:" kube::test::describe_resource_assert rs "Name:" "Pod Template:" "Labels:" "Selector:" "Replicas:" "Pods Status:" "Volumes:"
# Describe command should print events information by default # Describe command should print events information by default
kube::test::describe_resource_events_assert rs kube::test::describe_resource_events_assert rs
# Describe command should not print events information when show-events=false # Describe command should not print events information when show-events=false

10
test/e2e/kubectl.go
View File

@ -734,19 +734,15 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
requiredStrings := [][]string{ requiredStrings := [][]string{
{"Name:", "redis-master"}, {"Name:", "redis-master"},
{"Namespace:", ns}, {"Namespace:", ns},
{"Image(s):", redisImage},
{"Selector:", "app=redis,role=master"}, {"Selector:", "app=redis,role=master"},
{"Labels:", "app=redis"}, {"Labels:", "app=redis"},
{"role=master"}, {"role=master"},
{"Annotations:"}, {"Annotations:"},
{"Replicas:", "1 current", "1 desired"}, {"Replicas:", "1 current", "1 desired"},
{"Pods Status:", "1 Running", "0 Waiting", "0 Succeeded", "0 Failed"}, {"Pods Status:", "1 Running", "0 Waiting", "0 Succeeded", "0 Failed"},
// {"Events:"} would ordinarily go in the list {"Pod Template:"},
// here, but in some rare circumstances the {"Image:", redisImage},
// events are delayed, and instead kubectl {"Events:"}}
// prints "No events." This string will match
// either way.
{"vents"}}
checkOutput(output, requiredStrings) checkOutput(output, requiredStrings)
// Service // Service