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

Merge pull request #18946 from smarterclayton/httplog

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-04 21:34:09 -08:00
commit d30f99b377
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/httplog/log.go
View File

@ -200,6 +200,11 @@ func (rl *respLogger) Hijack() (net.Conn, *bufio.ReadWriter, error) {
return rl.w.(http.Hijacker).Hijack() return rl.w.(http.Hijacker).Hijack()
} }
// CloseNotify implements http.CloseNotifier
func (rl *respLogger) CloseNotify() <-chan bool {
return rl.w.(http.CloseNotifier).CloseNotify()
}
func (rl *respLogger) recordStatus(status int) { func (rl *respLogger) recordStatus(status int) {
rl.status = status rl.status = status
rl.statusRecorded = true rl.statusRecorded = true

14
test/integration/master_test.go
View File

@ -37,3 +37,17 @@ func TestExperimentalPrefix(t *testing.T) {
t.Fatalf("got status %v instead of 200 OK", resp.StatusCode) t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
} }
} }
func TestWatchSucceedsWithoutArgs(t *testing.T) {
_, s := framework.RunAMaster(t)
defer s.Close()
resp, err := http.Get(s.URL + "/api/v1/namespaces?watch=1")
if err != nil {
t.Fatalf("unexpected error getting experimental prefix: %v", err)
}
if resp.StatusCode != http.StatusOK {
t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
}
resp.Body.Close()
}