github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6972 from wojtek-t/allow_more_retries_in_density 

Allow more retries on errors in density test
pull/6/head
Filip Grzadkowski 2015-04-17 13:36:46 +02:00
parent a20215beec fafcf79d5d
commit 3f44143105
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apiserver/apiserver.go
View File

@ -257,7 +257,6 @@ func writeJSON(statusCode int, codec runtime.Codec, object runtime.Object, w htt
return return
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
glog.Infof("Writting status code: %d", statusCode)
w.WriteHeader(statusCode) w.WriteHeader(statusCode)
w.Write(formatted.Bytes()) w.Write(formatted.Bytes())
} }

2
test/e2e/density.go
View File

@ -36,7 +36,7 @@ import (
// Convenient wrapper around listing pods supporting retries. // Convenient wrapper around listing pods supporting retries.
func listPods(c *client.Client, namespace string, label labels.Selector) (*api.PodList, error) { func listPods(c *client.Client, namespace string, label labels.Selector) (*api.PodList, error) {
maxRetries := 2 maxRetries := 4
pods, err := c.Pods(namespace).List(label) pods, err := c.Pods(namespace).List(label)
for i := 0; i < maxRetries; i++ { for i := 0; i < maxRetries; i++ {
if err == nil { if err == nil {