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

Merge branch 'fix-logs' of https://gitlab-odx.oracle.com/odx/functions into fix-logs

Browse Source
This commit is contained in:
Travis Reeder
2017-06-21 07:52:51 -07:00
parent bc9b274d43 89cf27c739
commit 6159deb22d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/runner/runner_test.go
View File

@@ -8,6 +8,7 @@ import (
"testing" "testing"
"time" "time"
"gitlab-odx.oracle.com/odx/functions/api/id"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "gitlab-odx.oracle.com/odx/functions/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/models" "gitlab-odx.oracle.com/odx/functions/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "gitlab-odx.oracle.com/odx/functions/api/runner/task"
@@ -21,7 +22,8 @@ func TestRunnerHello(t *testing.T) {
ds := datastore.NewMock() ds := datastore.NewMock()
fnl := logs.NewMock() fnl := logs.NewMock()
runner, err := New(ctx, NewFuncLogger(fnl), NewMetricLogger(), ds) fLogger := NewFuncLogger(fnl)
runner, err := New(ctx, fLogger, NewMetricLogger(), ds)
if err != nil { if err != nil {
t.Fatalf("Test error during New() - %s", err) t.Fatalf("Test error during New() - %s", err)
} }
@@ -33,19 +35,21 @@ func TestRunnerHello(t *testing.T) {
expectedStatus string expectedStatus string
expectedOut string expectedOut string
expectedErr string expectedErr string
taskID string
}{ }{
{&models.Route{Image: "funcy/hello"}, ``, "success", "Hello World!", ""}, {&models.Route{Image: "funcy/hello"}, ``, "success", "Hello World!", "", id.New().String()},
{&models.Route{Image: "funcy/hello"}, `{"name": "test"}`, "success", "Hello test!", ""}, {&models.Route{Image: "funcy/hello"}, `{"name": "test"}`, "success", "Hello test!", "", id.New().String()},
} { } {
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cfg := &task.Config{ cfg := &task.Config{
ID: fmt.Sprintf("hello-%d-%d", i, time.Now().Unix()), ID: test.taskID,
Image: test.route.Image, Image: test.route.Image,
Timeout: 10 * time.Second, Timeout: 10 * time.Second,
Ready: make(chan struct{}), Ready: make(chan struct{}),
Stdin: strings.NewReader(test.payload), Stdin: strings.NewReader(test.payload),
AppName: test.route.AppName,
Stdout: &stdout, Stdout: &stdout,
Stderr: &stderr, Stderr: fLogger.Writer(ctx, test.route.AppName, test.route.AppName, test.route.Image, test.taskID),
} }
result, err := runner.run(ctx, cfg) result, err := runner.run(ctx, cfg)
@@ -78,7 +82,8 @@ func TestRunnerError(t *testing.T) {
ds := datastore.NewMock() ds := datastore.NewMock()
fnl := logs.NewMock() fnl := logs.NewMock()
runner, err := New(ctx, NewFuncLogger(fnl), NewMetricLogger(), ds) fLogger := NewFuncLogger(fnl)
runner, err := New(ctx, fLogger, NewMetricLogger(), ds)
if err != nil { if err != nil {
t.Fatalf("Test error during New() - %s", err) t.Fatalf("Test error during New() - %s", err)
} }
@@ -89,9 +94,10 @@ func TestRunnerError(t *testing.T) {
expectedStatus string expectedStatus string
expectedOut string expectedOut string
expectedErr string expectedErr string
taskID string
}{ }{
{&models.Route{Image: "funcy/error"}, ``, "error", "", ""}, {&models.Route{Image: "funcy/error"}, ``, "error", "", "", id.New().String()},
{&models.Route{Image: "funcy/error"}, `{"name": "test"}`, "error", "", ""}, {&models.Route{Image: "funcy/error"}, `{"name": "test"}`, "error", "", "", id.New().String()},
} { } {
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cfg := &task.Config{ cfg := &task.Config{
@@ -101,7 +107,7 @@ func TestRunnerError(t *testing.T) {
Ready: make(chan struct{}), Ready: make(chan struct{}),
Stdin: strings.NewReader(test.payload), Stdin: strings.NewReader(test.payload),
Stdout: &stdout, Stdout: &stdout,
Stderr: &stderr, Stderr: fLogger.Writer(ctx, test.route.AppName, test.route.AppName, test.route.Image, test.taskID),
} }
result, err := runner.run(ctx, cfg) result, err := runner.run(ctx, cfg)

2
api/version/version.go
View File

@@ -1,4 +1,4 @@
package version package version
// Version of Functions // Version of Functions
var Version = "0.3.8" var Version = "0.3.13"