Skip to content

Commit

Permalink
add sharness test for log endpoint
Browse files Browse the repository at this point in the history
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
  • Loading branch information
whyrusleeping committed Jun 18, 2015
1 parent fef56ea commit b4d1f6f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
4 changes: 4 additions & 0 deletions core/corehttp/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ func (w *writeErrNotifier) Write(b []byte) (int, error) {
default:
}
}
if f, ok := w.w.(http.Flusher); ok {
f.Flush()
}
return n, err
}

Expand All @@ -38,6 +41,7 @@ func LogOption() ServeOption {
w.WriteHeader(200)
wnf, errs := newWriteErrNotifier(w)
eventlog.WriterGroup.AddWriter(wnf)
log.Event(n.Context(), "log API client connected")
<-errs
})
return mux, nil
Expand Down
8 changes: 8 additions & 0 deletions test/sharness/t0110-gateway.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ test_expect_success "GET /webui/ returns code expected" '
test_curl_resp_http_code "http://127.0.0.1:$apiport/webui/" "HTTP/1.1 302 Found" "HTTP/1.1 301 Moved Permanently"
'

test_expect_success "GET /logs returns logs" '
test_expect_code 28 curl http://127.0.0.1:$apiport/logs -m1 > log_out
'

test_expect_success "log output looks good" '
grep "log API client connected" log_out
'

test_kill_ipfs_daemon

test_done
2 changes: 1 addition & 1 deletion thirdparty/eventlog/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (mw *MirrorWriter) Write(b []byte) (int, error) {
continue
}

j := len(mw.writers)
j := len(mw.writers) - 1
for ; j > i; j-- {
if mw.writers[j] != nil {
mw.writers[i], mw.writers[j] = mw.writers[j], nil // swap
Expand Down

0 comments on commit b4d1f6f

Please sign in to comment.