alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stream test commence (#1224)

Browse Source 
* initial invoke testing

this assures that Content-Type and Fn-Http-Status are set for an http-stream
function. it took some fixing up of the test utils code for the plumbing to
work, looking forward to deleting most stuff in fn-test-utils.go file around
each format -- had to update fdk-go to latest for http-stream support. this
only adds 1 test, since there's some machinery here, and would like to unblock
working on the http gateway simultaneously while adding a full suite of invoke
tests (this work can be parallelized)...

i added debug logs back to the debugging output. turns out this is useful, but
it can get noisy (only when things fail, hopefully).

* fix oom tests?
This commit is contained in:
Reed Allman
2018-09-19 08:48:48 -07:00
committed by GitHub
parent 111f2d4a1c
commit 485fa465a0
6 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
images/fn-test-utils/fn-test-utils.go
View File

@@ -111,33 +111,30 @@ func AppHandler(ctx context.Context, in io.Reader, out io.Writer) {
}
}
var outto fdkresponse
outto.Writer = out
finalizeRequest(&outto, req, resp)
finalizeRequest(out, req, resp)
err := postProcessRequest(req, out)
if err != nil {
panic(err.Error())
}
}
func finalizeRequest(out *fdkresponse, req *AppRequest, resp *AppResponse) {
func finalizeRequest(out io.Writer, req *AppRequest, resp *AppResponse) {
// custom response code
if req.ResponseCode != 0 {
out.Status = req.ResponseCode
} else {
out.Status = 200
fdk.WriteStatus(out, req.ResponseCode)
}
// custom content type
if req.ResponseContentType != "" {
out.Header.Set("Content-Type", req.ResponseContentType)
fdk.SetHeader(out, "Content-Type", req.ResponseContentType)
}
// NOTE: don't add 'application/json' explicitly here as an else,
// we will test that go's auto-detection logic does not fade since
// some people are relying on it now
if req.JasonContentType != "" {
out.JasonContentType = req.JasonContentType
// this will get picked up by our json out handler...
fdk.SetHeader(out, "Content-Type", req.JasonContentType)
}
if !req.IsEmptyBody {
@@ -294,6 +291,8 @@ func testDo(format string, in io.Reader, out io.Writer) {
testDoJSON(ctx, in, out)
case "default":
fdkutils.DoDefault(fdk.HandlerFunc(AppHandler), ctx, in, out)
case "http-stream":
fdk.Handle(fdk.HandlerFunc(AppHandler)) // XXX(reed): can extract & instrument
default:
panic("unknown format (fdk-go): " + format)
}
@@ -331,7 +330,7 @@ func testDoJSON(ctx context.Context, in io.Reader, out io.Writer) {
func testDoJSONOnce(ctx context.Context, in io.Reader, out io.Writer, buf *bytes.Buffer, hdr http.Header) error {
buf.Reset()
fdkutils.ResetHeaders(hdr)
var resp fdkresponse
var resp fdkutils.Response
resp.Writer = buf
resp.Status = 200
resp.Header = hdr
@@ -383,19 +382,11 @@ func testDoJSONOnce(ctx context.Context, in io.Reader, out io.Writer, buf *bytes
return postProcessRequest(appRequest, out)
}
// since we need to test little jason's content type since he's special. but we
// don't want to add redundant and confusing fields to the fdk...
type fdkresponse struct {
fdkutils.Response
JasonContentType string // dumb
}
// copy of fdk.GetJSONResp but with sugar for stupid jason's little fields
func getJSONResp(buf *bytes.Buffer, fnResp *fdkresponse, req *fdkutils.JsonIn) *fdkutils.JsonOut {
func getJSONResp(buf *bytes.Buffer, fnResp *fdkutils.Response, req *fdkutils.JsonIn) *fdkutils.JsonOut {
return &fdkutils.JsonOut{
Body: buf.String(),
ContentType: fnResp.JasonContentType,
ContentType: fnResp.Header.Get("Content-Type"),
Protocol: fdkutils.CallResponseHTTP{
StatusCode: fnResp.Status,
Headers: fnResp.Header,
@@ -406,7 +397,7 @@ func getJSONResp(buf *bytes.Buffer, fnResp *fdkresponse, req *fdkutils.JsonIn) *
func testDoHTTPOnce(ctx context.Context, in io.Reader, out io.Writer, buf *bytes.Buffer, hdr http.Header) error {
buf.Reset()
fdkutils.ResetHeaders(hdr)
var resp fdkresponse
var resp fdkutils.Response
resp.Writer = buf
resp.Status = 200
resp.Header = hdr
@@ -442,7 +433,7 @@ func testDoHTTPOnce(ctx context.Context, in io.Reader, out io.Writer, buf *bytes
appRequest = appReq
}
hResp := fdkutils.GetHTTPResp(buf, &resp.Response, req)
hResp := fdkutils.GetHTTPResp(buf, &resp, req)
err = hResp.Write(out)
if err != nil {