github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26422 from sttts/sttts-flake-26210-status-error

Browse Source 
Flake 26210: verbosely print StatusError in proxy e2e test
This commit is contained in:
Alex Robinson 2016-05-27 14:20:11 -07:00
commit 644258fa56
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/proxy.go
View File

@ -25,6 +25,7 @@ import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
@ -209,12 +210,12 @@ func proxyContext(version string) {
} }
wg := sync.WaitGroup{} wg := sync.WaitGroup{}
errors := []string{} errs := []string{}
errLock := sync.Mutex{} errLock := sync.Mutex{}
recordError := func(s string) { recordError := func(s string) {
errLock.Lock() errLock.Lock()
defer errLock.Unlock() defer errLock.Unlock()
errors = append(errors, s) errs = append(errs, s)
} }
for i := 0; i < proxyAttempts; i++ { for i := 0; i < proxyAttempts; i++ {
for path, val := range expectations { for path, val := range expectations {
@ -223,7 +224,11 @@ func proxyContext(version string) {
defer wg.Done() defer wg.Done()
body, status, d, err := doProxy(f, path) body, status, d, err := doProxy(f, path)
if err != nil { if err != nil {
recordError(fmt.Sprintf("%v: path %v gave error: %v", i, path, err)) if serr, ok := err.(*errors.StatusError); ok {
recordError(fmt.Sprintf("%v: path %v gave status error: %+v", i, path, serr.Status()))
} else {
recordError(fmt.Sprintf("%v: path %v gave error: %v", i, path, err))
}
return return
} }
if status != http.StatusOK { if status != http.StatusOK {
@ -242,7 +247,7 @@ func proxyContext(version string) {
} }
wg.Wait() wg.Wait()
if len(errors) != 0 { if len(errs) != 0 {
body, err := f.Client.Pods(f.Namespace.Name).GetLogs(pods[0].Name, &api.PodLogOptions{}).Do().Raw() body, err := f.Client.Pods(f.Namespace.Name).GetLogs(pods[0].Name, &api.PodLogOptions{}).Do().Raw()
if err != nil { if err != nil {
framework.Logf("Error getting logs for pod %s: %v", pods[0].Name, err) framework.Logf("Error getting logs for pod %s: %v", pods[0].Name, err)
@ -250,7 +255,7 @@ func proxyContext(version string) {
framework.Logf("Pod %s has the following error logs: %s", pods[0].Name, body) framework.Logf("Pod %s has the following error logs: %s", pods[0].Name, body)
} }
Fail(strings.Join(errors, "\n")) Fail(strings.Join(errs, "\n"))
} }
}) })
} }