github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix failing test in probe/http

Browse Source 
The error that Go 1.5 returns is different compared to 1.4. Support both.
This commit is contained in:
Daniel Martí 2015-08-21 16:00:44 -07:00
parent 5f3aff2c43
commit 0b10c6cfae
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/probe/http/http_test.go
View File

@ -29,6 +29,15 @@ import (
"k8s.io/kubernetes/pkg/probe" "k8s.io/kubernetes/pkg/probe"
) )
func containsAny(s string, substrs []string) bool {
for _, substr := range substrs {
if strings.Contains(s, substr) {
return true
}
}
return false
}
func TestHTTPProbeChecker(t *testing.T) { func TestHTTPProbeChecker(t *testing.T) {
handleReq := func(s int, body string) func(w http.ResponseWriter) { handleReq := func(s int, body string) func(w http.ResponseWriter) {
return func(w http.ResponseWriter) { return func(w http.ResponseWriter) {
@ -41,12 +50,31 @@ func TestHTTPProbeChecker(t *testing.T) {
testCases := []struct { testCases := []struct {
handler func(w http.ResponseWriter) handler func(w http.ResponseWriter)
health probe.Result health probe.Result
body string // go1.5: error message changed for timeout, need to support
// both old and new
accBodies []string
}{ }{
// The probe will be filled in below. This is primarily testing that an HTTP GET happens. // The probe will be filled in below. This is primarily testing that an HTTP GET happens.
{handleReq(http.StatusOK, "ok body"), probe.Success, "ok body"}, {
{handleReq(-1, "fail body"), probe.Failure, "fail body"}, handleReq(http.StatusOK, "ok body"),
{func(w http.ResponseWriter) { time.Sleep(3 * time.Second) }, probe.Failure, "use of closed network connection"}, probe.Success,
[]string{"ok body"},
},
{
handleReq(-1, "fail body"),
probe.Failure,
[]string{"fail body"},
},
{
func(w http.ResponseWriter) {
time.Sleep(3 * time.Second)
},
probe.Failure,
[]string{
"use of closed network connection",
"request canceled (Client.Timeout exceeded while awaiting headers)",
},
},
} }
for _, test := range testCases { for _, test := range testCases {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@ -74,8 +102,8 @@ func TestHTTPProbeChecker(t *testing.T) {
if health != test.health { if health != test.health {
t.Errorf("Expected %v, got %v", test.health, health) t.Errorf("Expected %v, got %v", test.health, health)
} }
if !strings.Contains(output, test.body) { if !containsAny(output, test.accBodies) {
t.Errorf("Expected %v, got %v", test.body, output) t.Errorf("Expected one of %#v, got %v", test.accBodies, output)
} }
} }
} }